Changeset 1536 for pykota/trunk

Timestamp:

06/11/04 00:42:06 (20 years ago)

Author:

jalet

Message:

Better messages in logs

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/accounters/hardware.py (modified) (2 diffs)
• pykota/accounters/software.py (modified) (2 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.19alpha20 :
+    
+        - More complete logging messages wrt accounters.
+        
     - 1.19alpha19 :
     

pykota/trunk/pykota/accounters/hardware.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.5  2004/06/10 22:42:06  jalet
+# Better messages in logs
+#
 # Revision 1.4  2004/05/24 22:45:49  jalet
 # New 'enforcement' directive added
@@ -103 +106 @@
         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")
         error = 1
         pagecounter = None
         child = popen2.Popen4(commandline)    
         try :
-            pagecounter = int(child.fromchild.readline().strip())
+            line = child.fromchild.readline()
+            pagecounter = int(line.strip())
         except ValueError :    
-            pass
+            self.filter.logger.log_message(_("Incorrect answer : %s") % repr(line), "error")
         except IOError :    
             # we were interrupted by a signal, certainely a SIGTERM

pykota/trunk/pykota/accounters/software.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.5  2004/06/10 22:42:06  jalet
+# Better messages in logs
+#
 # Revision 1.4  2004/06/02 21:51:14  jalet
 # Moved the sigterm capturing elsewhere
@@ -46 +49 @@
     def computeJobSize(self) :    
         """Feeds an external command with our datas to let it compute the job size, and return its value."""
-        self.filter.logdebug("Launching software accounter %s" % self.arguments)
+        self.filter.logger.log_message(_("Launching SOFTWARE(%s)...") % self.arguments, "info")
         MEGABYTE = 1024*1024
         self.filter.jobdatastream.seek(0)

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.19alpha19_unofficial"
+__version__ = "1.19alpha20_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""