Changeset 1475 for pykota/trunk/pykota

Timestamp:

05/13/04 15:59:30 (20 years ago)

Author:

jalet

Message:

Code simplifications

Location:

pykota/trunk/pykota

Files:

• accounters/external.py (deleted)
• accounters/hardware.py (added)
• accounters/Makefile.am (modified) (1 diff)
• accounters/querying.py (deleted)
• accounters/software.py (added)
• accounters/stupid.py (deleted)
• config.py (modified) (4 diffs)
• requesters/external.py (modified) (3 diffs)
• requesters/Makefile.am (modified) (1 diff)
• requesters/snmp.py (deleted)
• tool.py (modified) (3 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/accounters/Makefile.am

@@ -2 +2 @@
 
 pykota_accounters_PYTHON =      \
-        external.py                             \
+        software.py                             \
         __init__.py                             \
-        querying.py                             \
-        stupid.py                               
+        hardware.py
 

pykota/trunk/pykota/config.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.46  2004/05/13 13:59:28  jalet
+# Code simplifications
+#
 # Revision 1.45  2004/03/01 10:22:30  jalet
 # Can now extract per printer pre and post hooks from the configuration file
@@ -303 +306 @@
         """Returns the accounter backend to use for a given printer.
         
-           if it is not set, it defaults to 'querying' which means ask printer
+           if it is not set, it defaults to 'hardware' which means ask printer
            for its internal lifetime page counter.
         """   
-        validaccounters = [ "querying", "stupid", "external" ]     
+        validaccounters = [ "hardware", "software" ]     
         fullaccounter = self.getPrinterOption(printername, "accounter").strip()
-        if fullaccounter.lower().startswith("external") :    
+        if fullaccounter.lower().startswith("software") :    
             try :
                 (accounter, args) = [x.strip() for x in fullaccounter.split('(', 1)]
@@ -343 +346 @@
         except PyKotaConfigError :    
             # No requester defined, maybe it is not needed if accounting method
-            # is not set to 'querying', but if we are called, then the accounting
-            # method really IS 'querying', and so there's a big problem.
+            # is not set to 'hardware', but if we are called, then the accounting
+            # method really IS 'hardware', and so there's a big problem.
             raise PyKotaConfigError, _("Option requester for printer %s was not set") % printername
         else :    
@@ -355 +358 @@
             if not args :
                 raise PyKotaConfigError, _("Invalid requester %s for printer %s") % (fullrequester, printername)
-            validrequesters = [ "snmp", "external" ] # TODO : add more requesters
+            validrequesters = [ "external" ] 
             requester = requester.lower()
             if requester not in validrequesters :

pykota/trunk/pykota/requesters/external.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.12  2004/05/13 13:59:30  jalet
+# Code simplifications
+#
 # Revision 1.11  2004/04/09 22:24:47  jalet
 # Began work on correct handling of child processes when jobs are cancelled by
@@ -63 +66 @@
 #
 
+import sys
 import os
+import popen2
+import signal
 from pykota.requester import PyKotaRequesterError
 
@@ -82 +88 @@
         if printer is None :
             raise PyKotaRequesterError, _("Unknown printer address in EXTERNAL(%s) for printer %s") % (commandline, self.printername)
-        answer = os.popen(commandline)
+        error = 1
+        pagecounter = None
+        child = popen2.Popen4(commandline)    
         try :
-            pagecounter = int(answer.readline().strip())
+            pagecounter = int(child.fromchild.readline().strip())
         except ValueError :    
+            pass
+        except IOError :    
+            # we were interrupted by a signal, certainely a SIGTERM
+            # caused by the user cancelling the current job
+            try :
+                os.kill(child.pid, signal.SIGTERM)
+            except :    
+                pass # already killed ?
+            self.kotabackend.logger.log_message(_("SIGTERM was sent to external requester %s (pid: %s)") % (commandline, child.pid), "info")
+        else :    
+            error = 0
+        child.fromchild.close()    
+        child.tochild.close()
+        status = child.wait()
+        if (not error) and os.WIFEXITED(status) and (not os.WEXITSTATUS(status)) :
+            return pagecounter
+        else :    
             raise PyKotaRequesterError, _("Unable to query printer %s via EXTERNAL(%s)") % (printer, commandline) 
-        answer.close()
-        return pagecounter
         

pykota/trunk/pykota/requesters/Makefile.am

@@ -3 +3 @@
 pykota_requesters_PYTHON =      \
         external.py                             \
-        __init__.py                             \
-        snmp.py
+        __init__.py
 

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.86  2004/05/13 13:59:28  jalet
+# Code simplifications
+#
 # Revision 1.85  2004/05/11 08:26:27  jalet
 # Now catches connection problems to SMTP server
@@ -809 +812 @@
             
     def prehook(self, userpquota) :
-        """Allows pluging of an external hook before the job gets printed."""
+        """Allows plugging of an external hook before the job gets printed."""
         prehook = self.config.getPreHook(userpquota.Printer.Name)
         if prehook :
@@ -816 +819 @@
         
     def posthook(self, userpquota) :
-        """Allows pluging of an external hook after the job gets printed and/or denied."""
+        """Allows plugging of an external hook after the job gets printed and/or denied."""
         posthook = self.config.getPostHook(userpquota.Printer.Name)
         if posthook :

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.19alpha7_unofficial"
+__version__ = "1.19alpha8_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""