Changeset 1584 for pykota/trunk/pykota/accounters

Timestamp:

07/01/04 21:56:43 (20 years ago)

Author:

jalet

Message:

Better dispatching of error messages

Location:

pykota/trunk/pykota/accounters

Files:

• hardware.py (modified) (5 diffs)
• software.py (modified) (6 diffs)

pykota/trunk/pykota/accounters/hardware.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.6  2004/07/01 19:56:42  jalet
+# Better dispatching of error messages
+#
 # Revision 1.5  2004/06/10 22:42:06  jalet
 # Better messages in logs
@@ -60 +63 @@
             # can't get actual page counter, assume printer is off or warming up
             # log the message anyway.
-            self.filter.logger.log_message("%s" % msg, "warn")
+            self.filter.printInfo("%s" % msg, "warn")
             counter = None
         self.filter.logdebug("Printer's internal page counter value is : %s" % str(counter))
@@ -106 +109 @@
         if printer is None :
             raise PyKotaAccounterError, _("Unknown printer address in HARDWARE(%s) for printer %s") % (commandline, self.filter.printername)
-        self.filter.logger.log_message(_("Launching HARDWARE(%s)...") % commandline, "info")
+        self.filter.printInfo(_("Launching HARDWARE(%s)...") % commandline)
         error = 1
         pagecounter = None
@@ -114 +117 @@
             pagecounter = int(line.strip())
         except ValueError :    
-            self.filter.logger.log_message(_("Incorrect answer : %s") % repr(line), "error")
+            self.filter.printInfo(_("Incorrect answer : %s") % repr(line), "error")
         except IOError :    
             # we were interrupted by a signal, certainely a SIGTERM
@@ -122 +125 @@
             except :    
                 pass # already killed ?
-            self.filter.logger.log_message(_("SIGTERM was sent to hardware accounter %s (pid: %s)") % (commandline, child.pid), "info")
+            self.filter.printInfo(_("SIGTERM was sent to hardware accounter %s (pid: %s)") % (commandline, child.pid))
         else :    
             error = 0

pykota/trunk/pykota/accounters/software.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.6  2004/07/01 19:56:43  jalet
+# Better dispatching of error messages
+#
 # Revision 1.5  2004/06/10 22:42:06  jalet
 # Better messages in logs
@@ -49 +52 @@
     def computeJobSize(self) :    
         """Feeds an external command with our datas to let it compute the job size, and return its value."""
-        self.filter.logger.log_message(_("Launching SOFTWARE(%s)...") % self.arguments, "info")
+        self.filter.printInfo(_("Launching SOFTWARE(%s)...") % self.arguments)
         MEGABYTE = 1024*1024
         self.filter.jobdatastream.seek(0)
@@ -62 +65 @@
         except (IOError, OSError), msg :    
             msg = "%s : %s" % (self.arguments, msg) 
-            self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % msg)
+            self.filter.printInfo(_("Unable to compute job size with accounter %s") % msg)
         
         pagecount = 0
@@ -68 +71 @@
             pagecount = int(child.fromchild.readline().strip())
         except (AttributeError, ValueError) :
-            self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % self.arguments)
+            self.filter.printInfo(_("Unable to compute job size with accounter %s") % self.arguments)
         except (IOError, OSError), msg :    
             msg = "%s : %s" % (self.arguments, msg) 
-            self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % msg)
+            self.filter.printInfo(_("Unable to compute job size with accounter %s") % msg)
         child.fromchild.close()
         
@@ -77 +80 @@
             retcode = child.wait()
         except OSError, msg :    
-            self.filter.logger.log_message(_("Problem while waiting for software accounter pid %s to exit : %s") % (child.pid, msg))
+            self.filter.printInfo(_("Problem while waiting for software accounter pid %s to exit : %s") % (child.pid, msg))
         else :    
             if os.WIFEXITED(retcode) :
@@ -83 +86 @@
             else :    
                 status = retcode
-            self.filter.logger.log_message(_("Software accounter %s exit code is %s") % (self.arguments, repr(retcode)))
+            self.filter.printInfo(_("Software accounter %s exit code is %s") % (self.arguments, repr(retcode)))
         self.filter.logdebug("Software accounter %s said job is %s pages long." % (self.arguments, pagecount))
         return pagecount