Changeset 3162 for pykota/trunk/pykota

Timestamp:

04/14/07 10:50:47 (17 years ago)

Author:

jerome

Message:

Added the 'skipinitialwait' directive to pykota.conf.
This halves the inter-job delay when using hardware accounting
when set.

Location:

pykota/trunk/pykota

Files:

• accounters/hardware.py (modified) (1 diff)
• accounters/pjl.py (modified) (2 diffs)
• accounters/snmp.py (modified) (2 diffs)
• config.py (modified) (1 diff)
• version.py (modified) (1 diff)

pykota/trunk/pykota/accounters/hardware.py

@@ -109 +109 @@
            The external command must report the life time page number of the printer on stdout.
         """
+        skipinitialwait = self.filter.config.getPrinterSkipInitialWait(printer)
         commandline = self.arguments.strip() % locals()
         cmdlower = commandline.lower()
         if (cmdlower == "snmp") or cmdlower.startswith("snmp:") :
-            return snmp.Handler(self, printer).retrieveInternalPageCounter()
+            return snmp.Handler(self, printer, skipinitialwait).retrieveInternalPageCounter()
         elif (cmdlower == "pjl") or cmdlower.startswith("pjl:") :
-            return pjl.Handler(self, printer).retrieveInternalPageCounter()
+            return pjl.Handler(self, printer, skipinitialwait).retrieveInternalPageCounter()
             
         if printer is None :

pykota/trunk/pykota/accounters/pjl.py

@@ -58 +58 @@
 class Handler :
     """A class for PJL print accounting."""
-    def __init__(self, parent, printerhostname) :
+    def __init__(self, parent, printerhostname, skipinitialwait=False) :
         self.parent = parent
         self.printerHostname = printerhostname
+        self.skipinitialwait = skipinitialwait
         try :
             self.port = int(self.parent.arguments.split(":")[1].strip())
@@ -181 +182 @@
         while 1 :
             self.retrievePJLValues()
+            if (self.printerInternalPageCounter is not None) \
+               and self.skipinitialwait \
+               and (os.environ.get("PYKOTAPHASE") == "BEFORE") :
+                self.parent.filter.logdebug("No need to wait for the printer to be idle, this should be the case already.")
+                return 
             idle_flag = 0
             if self.printerStatus in ('10000', '10001', '35078', '40000') :

pykota/trunk/pykota/accounters/snmp.py

@@ -109 +109 @@
 class BaseHandler :
     """A class for SNMP print accounting."""
-    def __init__(self, parent, printerhostname) :
+    def __init__(self, parent, printerhostname, skipinitialwait=False) :
         self.parent = parent
         self.printerHostname = printerhostname
+        self.skipinitialwait = skipinitialwait
         try :
             self.community = self.parent.arguments.split(":")[1].strip()
@@ -210 +211 @@
         while 1 :
             self.retrieveSNMPValues()
+            if (self.printerInternalPageCounter is not None) \
+               and self.skipinitialwait \
+               and (os.environ.get("PYKOTAPHASE") == "BEFORE") :
+                self.parent.filter.logdebug("No need to wait for the printer to be idle, this should be the case already.")
+                return 
             pstatusAsString = printerStatusValues.get(self.printerStatus)
             dstatusAsString = deviceStatusValues.get(self.deviceStatus)

pykota/trunk/pykota/config.py

@@ -691 +691 @@
             else :
                 del branches[k] # empty value disables a global option
-                
         return branches
+        
+    def getPrinterSkipInitialWait(self, printername) :
+        """Returns True if we want to skip the initial waiting loop, else False."""
+        try :
+            return self.isTrue(self.getPrinterOption(printername, "skipinitialwait"))
+        except PyKotaConfigError :
+            return False

pykota/trunk/pykota/version.py

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