Changeset 1749

Timestamp:

09/27/04 22:09:30 (20 years ago)

Author:

jalet

Message:

Lowered timeout delay for PJL queries

Files:

• pykota/trunk/pykota/accounters/hardware.py (modified) (6 diffs)

pykota/trunk/pykota/accounters/hardware.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.28  2004/09/27 20:09:30  jalet
+# Lowered timeout delay for PJL queries
+#
 # Revision 1.27  2004/09/27 20:00:35  jalet
 # Typo
@@ -125 +128 @@
 from pykota.accounter import AccounterBase, PyKotaAccounterError
 
+ITERATIONDELAY = 2.0   # 2 Seconds
+STABILIZATIONDELAY = 3 # We must read three times the same value to consider it to be stable
+
 try :
     from pysnmp.mapping.udp.error import SnmpOverUdpError
@@ -133 +139 @@
 else :    
     hasSNMP = 1
-    SNMPDELAY = 2.0             # 2 Seconds
-    STABILIZATIONDELAY = 3      # We must read three times the same value to consider it to be stable
     pageCounterOID = ".1.3.6.1.2.1.43.10.2.1.4.1.1"
     hrPrinterStatusOID = ".1.3.6.1.2.1.25.3.5.1.1.1"
@@ -196 +200 @@
                 # In reality, and if I'm not mistaken, we will NEVER get there.    
                 self.parent.filter.logdebug(_("Waiting for printer %s to be idle or printing...") % self.parent.filter.printername)    
-                time.sleep(SNMPDELAY)
+                time.sleep(ITERATIONDELAY)
             
         def waitIdle(self) :
@@ -215 +219 @@
                     idle_num = 0
                 self.parent.filter.logdebug(_("Waiting for printer %s's idle status to stabilize...") % self.parent.filter.printername)    
-                time.sleep(SNMPDELAY)
+                time.sleep(ITERATIONDELAY)
                 
 pjlMessage = "\033%-12345X@PJL USTATUSOFF\r\n@PJL USTATUS DEVICE=ON\r\n@PJL INFO STATUS\r\n@PJL INFO PAGECOUNT\r\n\033%-12345X"
@@ -259 +263 @@
                 while (self.timedout == 0) or (actualpagecount is None) or (self.printerStatus is None) :
                     signal.signal(signal.SIGALRM, self.alarmHandler)
-                    signal.alarm(5)
+                    signal.alarm(3)
                     try :
                         answer = sock.recv(1024)