Changeset 3548

Timestamp:

08/17/10 23:11:00 (14 years ago)

Author:

jerome

Message:

During SNMP accounting, I forgot to decrease the waiting delay at the
time the printer went back to a normal status, when it
was increased because the printer was down.

Files:

• pykota/trunk/pykota/accounters/snmp.py (modified) (5 diffs)

pykota/trunk/pykota/accounters/snmp.py

@@ -157 +157 @@
         """Waits for printer status being 'printing'."""
         statusstabilizationdelay = constants.get(self.parent.filter, "StatusStabilizationDelay")
-        increment = 1
         noprintingmaxdelay = constants.get(self.parent.filter, "NoPrintingMaxDelay")
         if not noprintingmaxdelay :
@@ -165 +164 @@
         previousValue = self.parent.getLastPageCounter()
         firstvalue = None
+        increment = 1
+        waitdelay = statusstabilizationdelay * increment
         while True :
             self.retrieveSNMPValues()
-            waitdelay = statusstabilizationdelay * increment
             error = self.checkIfError(self.printerDetectedErrorState)
             pstatusAsString = printerStatusValues.get(self.printerStatus)
@@ -206 +206 @@
                         if waitdelay < constants.FIVEMINUTES :
                             increment *= 2
-            self.parent.filter.logdebug("Waiting %s seconds for printer %s to be printing..." % (waitdelay, self.parent.filter.PrinterName))
+                    else :
+                        increment = 1
+            self.parent.filter.logdebug("Waiting %s seconds for printer %s to be printing..." % (waitdelay,
+                                                                                                 self.parent.filter.PrinterName))
             time.sleep(waitdelay)
+            waitdelay = statusstabilizationdelay * increment
 
     def waitIdle(self) :
@@ -214 +218 @@
         statusstabilizationloops = constants.get(self.parent.filter, "StatusStabilizationLoops")
         increment = 1
+        waitdelay = statusstabilizationdelay * increment
         idle_num = 0
         while True :
             self.retrieveSNMPValues()
-            waitdelay = statusstabilizationdelay * increment
             error = self.checkIfError(self.printerDetectedErrorState)
             pstatusAsString = printerStatusValues.get(self.printerStatus)
@@ -242 +246 @@
                 if waitdelay < constants.FIVEMINUTES :
                     increment *= 2
+            else :
+                increment = 1
             self.parent.filter.logdebug("Waiting %s seconds for printer %s's idle status to stabilize..." % (waitdelay,
                                                                                                              self.parent.filter.PrinterName))
             time.sleep(waitdelay)
+            waitdelay = statusstabilizationdelay * increment
 
     def retrieveInternalPageCounter(self) :