Changeset 601

Timestamp:

03/21/05 14:20:51 (19 years ago)

Author:

jerome

Message:

Added the possibility for prehooks to cancel print jobs

Location:

tea4cups/trunk

Files:

• tea4cups (modified) (4 diffs)
• tea4cups.conf (modified) (1 diff)

tea4cups/trunk/tea4cups

@@ -37 +37 @@
 from struct import unpack
 
-version = "1.5alpha"
+version = "2.00"
 
 class TeeError(Exception):
@@ -538 +538 @@
             if status :
                 exitcode = status
+            if (branchtype == "prehook") and (os.environ.get("TEASTATUS", "") == "CANCELLED") :
+                break # We don't want to execute tees or posthooks in this case
         signal.signal(signal.SIGTERM, signal.SIG_IGN)
         if not exitcode :
@@ -567 +569 @@
                     retcode = os.WEXITSTATUS(retcode)
                 if retcode :    
-                    self.logInfo("%s %s on printer %s didn't exit successfully." % (btypetitle, branch, self.PrinterName), "error")
-                    exitcode = 1
+                    if (btype == "prehook") and (retcode == 255) : # -1
+                        self.logInfo("Job %s cancelled by prehook %s" % (self.JobId, branch))
+                        os.environ["TEASTATUS"] = "CANCELLED" # and don't touch exitcode
+                    else :    
+                        self.logInfo("%s %s on printer %s didn't exit successfully." % (btypetitle, branch, self.PrinterName), "error")
+                        exitcode = 1
             self.logDebug("End serialized %ss" % btypetitle)
         else :        
@@ -601 +607 @@
                     retcode = os.WEXITSTATUS(retcode)
                 if retcode :    
-                    self.logInfo("%s %s (PID %s) on printer %s didn't exit successfully." % (btypetitle, branch, childpid, self.PrinterName), "error")
-                    exitcode = 1
+                    if (btype == "prehook") and (retcode == 255) : # -1
+                        self.logInfo("Job %s cancelled by prehook %s" % (self.JobId, branch))
+                        os.environ["TEASTATUS"] = "CANCELLED" # and don't touch exitcode
+                    else :    
+                        self.logInfo("%s %s (PID %s) on printer %s didn't exit successfully." % (btypetitle, branch, childpid, self.PrinterName), "error")
+                        exitcode = 1
                 if branch == "Original backend" :    
                     os.environ["TEASTATUS"] = str(retcode)

tea4cups/trunk/tea4cups.conf

@@ -107 +107 @@
 # prehook_0 : echo "Your print job has been accepted" | smbclient -M $TEAUSERNAME
 # posthook_0 : echo "Your print job has been printed with status $TEASTATUS" | smbclient -M $TEAUSERNAME
+#
+# NB : as a special feature, any prehook which exits with a -1 status (255) 
+# causes the job to NOT be sent to the real backend, in which case TEASTATUS 
+# value is the string CANCELLED. None of the tees and posthooks gets executed
+# in this case, but all remaining prehooks are still executed.
+#