Changeset 584

Timestamp:

03/13/05 18:22:22 (19 years ago)

Author:

jerome

Message:

Forked tees work fine now

Files:

• tea4cups/trunk/tea4cups (modified) (4 diffs)

tea4cups/trunk/tea4cups

@@ -25 +25 @@
 import sys
 import os
+import popen2
 import errno
 import md5
@@ -50 +51 @@
     pass 
     
+class Popen4ForCUPS(popen2.Popen4) :
+    """Our own class to execute real backends.
+    
+       Their first argument is different from their path so using
+       native popen2.Popen3 would not be feasible.
+    """
+    def __init__(self, cmd, bufsize=-1, arg0=None) :
+        self.arg0 = arg0
+        popen2.Popen4.__init__(self, cmd, bufsize)
+        
+    def _run_child(self, cmd):
+        try :
+            MAXFD = os.sysconf("SC_OPEN_MAX")
+        except (AttributeError, ValueError) :    
+            MAXFD = 256
+        for i in range(3, MAXFD) : 
+            try:
+                os.close(i)
+            except OSError:
+                pass
+        try:
+            os.execvpe(cmd[0], [self.arg0 or cmd[0]] + cmd[1:], os.environ)
+        finally:
+            os._exit(1)
+    
 # Some IPP constants    
 OPERATION_ATTRIBUTES_TAG = 0x01
@@ -211 +237 @@
         """Logs something to debug output if debug is enabled."""
         if self.debug :
-            sys.stderr.write("DEBUG: %s (PID %i) : %s\n" % (self.MyName, self.pid, message))
+            sys.stderr.write("DEBUG: %s (PID %i) : %s\n" % (self.MyName, os.getpid(), message))
             sys.stderr.flush()
             
     def logInfo(self, message, level="info") :        
         """Logs a message to CUPS' error_log file."""
-        sys.stderr.write("%s: %s (PID %i) : %s\n" % (level.upper(), self.MyName, self.pid, message))
+        sys.stderr.write("%s: %s (PID %i) : %s\n" % (level.upper(), self.MyName, os.getpid(), message))
         sys.stderr.flush()
         
@@ -487 +513 @@
     def runBranches(self) :         
         """Launches each tee defined for the current print queue."""
+        exitcode = 0
         branches = self.enumTeeBranches(self.PrinterName)
         if self.isTrue(self.getPrintQueueOption(self.PrinterName, "serialize", ignore=1)) :
+            self.logDebug("Serialized Tees")
             for (branch, command) in branches.items() :
                 self.logDebug("Launching %s : %s" % (branch, command))
-                os.system(command)
+                retcode = os.system(command)
+                self.logDebug("Exit code for tee %s on printer %s is %s" % (branch, self.PrinterName, retcode))
+                if os.WIFEXITED(retcode) :
+                    retcode = os.WEXITSTATUS(retcode)
+                if retcode :    
+                    self.logInfo("Tee %s on printer %s didn't exit successfully." % (branch, self.PrinterName), "error")
+                    exitcode = 1
         else :        
-            raise TeeError, "Forking tees not yet implemented."
+            self.logDebug("Forked Tees")
+            pids = {}
+            for (branch, command) in branches.items() :
+                pid = os.fork()
+                if pid :
+                    pids[branch] = pid
+                else :    
+                    self.logDebug("Launching %s : %s" % (branch, command))
+                    retcode = os.system(command)
+                    if os.WIFEXITED(retcode) :
+                        retcode = os.WEXITSTATUS(retcode)
+                    else :    
+                        retcode = -1
+                    sys.exit(retcode)
+            for (branch, pid) in pids.items() :
+                (childpid, retcode) = os.waitpid(pid, 0)
+                self.logDebug("Exit code for tee %s (PID %s) on printer %s is %s" % (branch, childpid, self.PrinterName, retcode))
+                if os.WIFEXITED(retcode) :
+                    retcode = os.WEXITSTATUS(retcode)
+                if retcode :    
+                    self.logInfo("Tee %s (PID %s) on printer %s didn't exit successfully." % (branch, childpid, self.PrinterName), "error")
+                    exitcode = 1
+        return exitcode
         
 if __name__ == "__main__" :