Changeset 1475 for pykota/trunk/pykota/requesters/external.py

Timestamp:

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

Author:

jalet

Message:

Code simplifications

Files:

• pykota/trunk/pykota/requesters/external.py (modified) (3 diffs)

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