Changeset 2423

Timestamp:

09/05/05 13:16:56 (19 years ago)

Author:

jerome

Message:

Prepare for parametrized internal hardware accounters

Location:

pykota/trunk/pykota/accounters

Files:

• pjl.py (modified) (4 diffs)
• snmp.py (modified) (3 diffs)

pykota/trunk/pykota/accounters/pjl.py

@@ -60 +60 @@
         self.parent = parent
         self.printerHostname = printerhostname
+        self.port = 9100
         self.printerInternalPageCounter = self.printerStatus = None
         self.timedout = 0
@@ -70 +71 @@
     def retrievePJLValues(self) :    
         """Retrieves a printer's internal page counter and status via PJL."""
-        port = 9100
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         try :
-            sock.connect((self.printerHostname, port))
+            sock.connect((self.printerHostname, self.port))
         except socket.error, msg :
-            self.parent.filter.printInfo(_("Problem during connection to %s:%s : %s") % (self.printerHostname, port, msg), "warn")
+            self.parent.filter.printInfo(_("Problem during connection to %s:%s : %s") % (self.printerHostname, self.port, msg), "warn")
         else :
             self.parent.filter.logdebug("Connected to printer %s" % self.printerHostname)
@@ -81 +81 @@
                 sock.send(pjlMessage)
             except socket.error, msg :
-                self.parent.filter.printInfo(_("Problem while sending PJL query to %s:%s : %s") % (self.printerHostname, port, msg), "warn")
+                self.parent.filter.printInfo(_("Problem while sending PJL query to %s:%s : %s") % (self.printerHostname, self.port, msg), "warn")
             else :    
                 self.parent.filter.logdebug("Query sent to %s : %s" % (self.printerHostname, repr(pjlMessage)))
@@ -95 +95 @@
                         break   # our alarm handler was launched, probably
                     except socket.error :    
-                        self.parent.filter.printInfo(_("Problem while receiving PJL answer from %s:%s : %s") % (self.printerHostname, port, msg), "warn")
+                        self.parent.filter.printInfo(_("Problem while receiving PJL answer from %s:%s : %s") % (self.printerHostname, self.port, msg), "warn")
                     else :    
                         readnext = 0

pykota/trunk/pykota/accounters/snmp.py

@@ -68 +68 @@
             self.parent = parent
             self.printerHostname = printerhostname
+            self.community = "public"
+            self.port = 161
             self.printerInternalPageCounter = None
             self.printerStatus = None
@@ -76 +78 @@
             ver = alpha.protoVersions[alpha.protoVersionId1]
             req = ver.Message()
-            req.apiAlphaSetCommunity('public')
+            req.apiAlphaSetCommunity(self.community)
             req.apiAlphaSetPdu(ver.GetRequestPdu())
             req.apiAlphaGetPdu().apiAlphaSetVarBindList((pageCounterOID, ver.Null()), \
@@ -83 +85 @@
             tsp = Manager()
             try :
-                tsp.sendAndReceive(req.berEncode(), (self.printerHostname, 161), (self.handleAnswer, req))
+                tsp.sendAndReceive(req.berEncode(), \
+                                   (self.printerHostname, self.port), \
+                                   (self.handleAnswer, req))
             except (SnmpOverUdpError, select.error), msg :    
                 self.parent.filter.printInfo(_("Network error while doing SNMP queries on printer %s : %s") % (self.printerHostname, msg), "warn")