Changeset 1687 for pykota/trunk/pykota

Timestamp:

09/01/04 01:29:53 (20 years ago)

Author:

jalet

Message:

Introduction of the new 'onaccountererror' configuration directive.
Small fix for software accounter's return code which can't be None anymore.
Make software and hardware accounting code look similar : will be factorized
later.

Location:

pykota/trunk/pykota

Files:

• accounter.py (modified) (2 diffs)
• accounters/hardware.py (modified) (2 diffs)
• accounters/software.py (modified) (2 diffs)
• config.py (modified) (2 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/accounter.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.19  2004/08/31 23:29:53  jalet
+# Introduction of the new 'onaccountererror' configuration directive.
+# Small fix for software accounter's return code which can't be None anymore.
+# Make software and hardware accounting code look similar : will be factorized
+# later.
+#
 # Revision 1.18  2004/07/22 22:41:48  jalet
 # Hardware accounting for LPRng should be OK now. UNTESTED.
@@ -97 +103 @@
         self.filter = kotafilter
         self.arguments = arguments
+        self.onerror = self.filter.config.getPrinterOnAccounterError(self.filter.printername)
         self.isSoftware = 1 # by default software accounting
         

pykota/trunk/pykota/accounters/hardware.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.11  2004/08/31 23:29:53  jalet
+# Introduction of the new 'onaccountererror' configuration directive.
+# Small fix for software accounter's return code which can't be None anymore.
+# Make software and hardware accounting code look similar : will be factorized
+# later.
+#
 # Revision 1.10  2004/08/27 22:49:04  jalet
 # No answer from subprocess now is really a fatal error. Waiting for some
@@ -154 +160 @@
         except OSError, msg :    
             self.filter.logdebug("Error while waiting for hardware accounter pid %s : %s" % (child.pid, msg))
-        if (pagecounter is not None) and os.WIFEXITED(status) and (not os.WEXITSTATUS(status)) :
-            return pagecounter
         else :    
-            raise PyKotaAccounterError, _("Unable to query printer %s via HARDWARE(%s)") % (printer, commandline) 
+            if os.WIFEXITED(status) :
+                status = os.WEXITSTATUS(status)
+            self.filter.printInfo(_("Hardware accounter %s exit code is %s") % (self.arguments, str(status)))
             
+        if pagecounter is None :
+            message = _("Unable to query printer %s via HARDWARE(%s)") % (printer, commandline)
+            if self.onerror == "CONTINUE" :
+                self.filter.printInfo(message, "error")
+            else :
+                raise PyKotaAccounterError, message 
+        return pagecounter        

pykota/trunk/pykota/accounters/software.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.10  2004/08/31 23:29:53  jalet
+# Introduction of the new 'onaccountererror' configuration directive.
+# Small fix for software accounter's return code which can't be None anymore.
+# Make software and hardware accounting code look similar : will be factorized
+# later.
+#
 # Revision 1.9  2004/08/25 22:34:39  jalet
 # Now both software and hardware accounting raise an exception when no valid
@@ -99 +105 @@
         
         try :
-            retcode = child.wait()
+            status = child.wait()
         except OSError, msg :    
             self.filter.printInfo(_("Problem while waiting for software accounter pid %s to exit : %s") % (child.pid, msg))
         else :    
-            if os.WIFEXITED(retcode) :
-                status = os.WEXITSTATUS(retcode)
-            else :    
-                status = retcode
+            if os.WIFEXITED(status) :
+                status = os.WEXITSTATUS(status)
             self.filter.printInfo(_("Software accounter %s exit code is %s") % (self.arguments, str(status)))
             
         if pagecounter is None :    
-            raise PyKotaAccounterError, _("Unable to compute job size with accounter %s") % self.arguments
+            message = _("Unable to compute job size with accounter %s") % self.arguments
+            if self.onerror == "CONTINUE" :
+                self.filter.printInfo(message, "error")
+            else :
+                raise PyKotaAccounterError, message
             
-        self.filter.logdebug("Software accounter %s said job is %s pages long." % (self.arguments, pagecounter))
-        return pagecounter    
-            
+        self.filter.logdebug("Software accounter %s said job is %s pages long." % (self.arguments, repr(pagecounter)))
+        return pagecounter or 0

pykota/trunk/pykota/config.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.51  2004/08/31 23:29:53  jalet
+# Introduction of the new 'onaccountererror' configuration directive.
+# Small fix for software accounter's return code which can't be None anymore.
+# Make software and hardware accounting code look similar : will be factorized
+# later.
+#
 # Revision 1.50  2004/07/27 07:07:27  jalet
 # Typo : treshold ==> threshold
@@ -366 +372 @@
             return enforcement    
             
+    def getPrinterOnAccounterError(self, printername) :    
+        """Returns what must be done whenever the accounter fails."""
+        validactions = [ "CONTINUE", "STOP" ]     
+        try :
+            action = self.getPrinterOption(printername, "onaccountererror")
+        except PyKotaConfigError :    
+            return "STOP"
+        else :    
+            action = action.upper()
+            if action not in validactions :
+                raise PyKotaConfigError, _("Option onaccountererror in section %s only supports values in %s") % (printername, str(validactions))
+            return action  
+            
     def getPrinterPolicy(self, printername) :    
         """Returns the default policy for the current printer."""

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.20alpha4_unofficial"
+__version__ = "1.20alpha5_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""