Changeset 676

Timestamp:

06/27/06 14:28:16 (18 years ago)

Author:

jerome

Message:

Added support for the 'retry' directive.
Fixed an IPP parsing problem.
Fixed the filename argument to the original backend : if a tea4cups filter was applied,
and the file was printed in raw mode, the filtered datas were not printed, but the raw
ones were.

Files:

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

tea4cups/trunk/tea4cups

@@ -26 +26 @@
 import sys
 import os
+import time
 import pwd
 import errno
@@ -123 +124 @@
         self.tags[0x05] = "unsupported-attributes-tag"
         self.tags[0x06] = "subscription-attributes-tag"
-        self.tags[0x07] = "event-notification-attributes-tag"
+        self.tags[0x07] = "event_notification-attributes-tag"
         
         # out of band values
@@ -531 +532 @@
         self.DeviceURI = device_uri
         self.PrinterName = os.environ.get("PRINTER", "")
-        self.Directory = self.getPrintQueueOption(self.PrinterName, "directory")
+        self.Directory = self.getPrintQueueOption(self.PrinterName, "directory", ignore=1) or tempfile.gettempdir()
         self.DataFile = os.path.join(self.Directory, "%s-%s-%s-%s" % (self.myname, self.PrinterName, self.UserName, self.JobId))
         (ippfilename, ippmessage) = self.parseIPPRequestFile()
@@ -675 +676 @@
     def cleanUp(self) :
         """Cleans up the place."""
-        if not self.isTrue(self.getPrintQueueOption(self.PrinterName, "keepfiles", ignore=1)) :
-            os.remove(self.DataFile)
+        if (not self.isTrue(self.getPrintQueueOption(self.PrinterName, "keepfiles", ignore=1))) \
+            and os.path.exists(self.DataFile) :
+            try :
+                os.remove(self.DataFile)
+            except OSError, msg :    
+                self.logInfo("Problem when removing %s : %s" % (self.DataFile, msg), "error")
 
     def sigtermHandler(self, signum, frame) :
@@ -698 +703 @@
         if not self.isCancelled and not self.gotSigTerm :
             if self.RealBackend :
-                retcode = self.runOriginalBackend()
+                retcode = self.launchOriginalBackend()
                 if retcode :
                     onfail = self.getPrintQueueOption(self.PrinterName, \
@@ -802 +807 @@
         return exitcode
 
+    def launchOriginalBackend(self) :
+        """Launches the original backend, optionally retrying if needed."""
+        number = 1
+        delay = 0
+        retry = self.getPrintQueueOption(self.PrinterName, "retry", ignore=1)
+        if retry is not None :
+            try :
+                (number, delay) = [int(p) for p in retry.strip().split(",")]
+            except (ValueError, AttributeError, TypeError) :    
+                self.logInfo("Invalid value '%s' for the 'retry' directive for printer %s in %s." % (retry, self.PrinterName, self.conffile), "error")
+                number = 1
+                delay = 0
+                
+        loopcount = 1 
+        while 1 :            
+            retcode = self.runOriginalBackend()
+            if not retcode :
+                break
+            else :
+                if (not number) or (loopcount < number) :
+                    self.logInfo(_("The real backend produced an error, we will try again in %s seconds.") % delay, "warn")
+                    time.sleep(delay)
+                    loopcount += 1
+                else :    
+                    break
+        return retcode            
+        
     def runOriginalBackend(self) :
         """Launches the original backend."""
@@ -814 +846 @@
                 os.dup2(f.fileno(), 0)
                 f.close()
+            else :    
+                arguments[6] = self.DataFile # in case a tea4cups filter was applied
             try :
                 os.execve(originalbackend, arguments, os.environ)
@@ -831 +865 @@
             status = os.WEXITSTATUS(status)
             if status :
-              self.logInfo("CUPS backend %s returned %d." % (originalbackend,\
+                self.logInfo("CUPS backend %s returned %d." % (originalbackend,\
                                                              status), "error")
             return status
@@ -852 +886 @@
         sys.exit(1)
     else :
+        retcode = 1
         try :
-            wrapper.readConfig()
-            wrapper.initBackend()
-            wrapper.saveDatasAndCheckSum()
-            wrapper.exportAttributes()
-            retcode = wrapper.runBranches()
+            try :
+                wrapper.readConfig()
+                wrapper.initBackend()
+                wrapper.saveDatasAndCheckSum()
+                wrapper.exportAttributes()
+                retcode = wrapper.runBranches()
+            except SystemExit, e :
+                retcode = e.code
+            except :
+                import traceback
+                lines = []
+                for line in traceback.format_exception(*sys.exc_info()) :
+                    lines.extend([l for l in line.split("\n") if l])
+                msg = "ERROR: ".join(["%s (PID %s) : %s\n" % (wrapper.MyName, \
+                                                              wrapper.pid, l) \
+                            for l in (["ERROR: Tea4CUPS v%s" % __version__] + lines)])
+                sys.stderr.write(msg)
+                sys.stderr.flush()
+                retcode = 1
+        finally :        
             wrapper.cleanUp()
-        except SystemExit, e :
-            retcode = e.code
-        except :
-            import traceback
-            lines = []
-            for line in traceback.format_exception(*sys.exc_info()) :
-                lines.extend([l for l in line.split("\n") if l])
-            msg = "ERROR: ".join(["%s (PID %s) : %s\n" % (wrapper.MyName, \
-                                                          wrapper.pid, l) \
-                        for l in (["ERROR: Tea4CUPS v%s" % __version__] + lines)])
-            sys.stderr.write(msg)
-            sys.stderr.flush()
-            retcode = 1
         sys.exit(retcode)