Changeset 2584

Timestamp:

11/15/05 22:47:29 (19 years ago)

Author:

jerome

Message:

Introduce the onbackenderror directive.
Make problems caused by real backend failures appear
as such in the printing history.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (5 diffs)
• bin/waitprinter.sh (modified) (1 diff)
• cgi-bin/printquota.cgi (modified) (1 diff)
• NEWS (modified) (1 diff)
• pykota/accounters/pjl.py (modified) (1 diff)
• pykota/accounters/snmp.py (modified) (1 diff)
• pykota/version.py (modified) (1 diff)
• stylesheets/pykota.css (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -988 +988 @@
         self.storage.beginTransaction()
         try :
+            onbackenderror = self.config.getPrinterOnBackendError(self.PrinterName)
+            if retcode :
+                # NB : We don't send any feedback to the end user. Only the admin
+                # has to know that the real CUPS backend failed.
+                self.Action = "PROBLEM"
+                self.exportReason()
+                if onbackenderror == "NOCHARGE" :
+                    self.JobSize = 0
+                    self.printInfo(_("Job size forced to 0 because the real CUPS backend failed. No accounting will be done."), "warn")
+                else :    
+                    self.printInfo(_("The real CUPS backend failed, but the job will be accounted for anyway."), "warn")
+                    
             # retrieve the job size    
             if self.Action == "DENY" :
@@ -994 +1006 @@
             else :    
                 self.UserPQuota.resetDenyBannerCounter()
-                self.JobSize = self.accounter.getJobSize(self.Printer)
-                self.sanitizeJobSize()
-                self.JobSize += self.BannerSize
+                if (self.Action != "PROBLEM") or (onbackenderror == "CHARGE") : 
+                    self.JobSize = self.accounter.getJobSize(self.Printer)
+                    self.sanitizeJobSize()
+                    self.JobSize += self.BannerSize
             self.printInfo(_("Job size : %i") % self.JobSize)
             
-            if (self.User.LimitBy == "nochange") or self.Printer.PassThrough :
+            if (self.Action == "PROBLEM") and (onbackenderror == "NOCHARGE") :
+                self.JobPrice = 0.0
+            elif (self.User.LimitBy == "nochange") or self.Printer.PassThrough :
                 # no need to update the quota for the current user on this printer
                 self.printInfo(_("User %s's quota on printer %s won't be modified") % (self.UserName, self.PrinterName))
@@ -1017 +1032 @@
             
             if hasattr(self, "BillingCode") and self.BillingCode and self.BillingCode.Exists :
-                self.BillingCode.consume(self.JobSize, self.JobPrice)
-                self.printInfo(_("Billing code %s was updated.") % self.BillingCode.BillingCode)
+                if (self.Action != "PROBLEM") or (onbackenderror == "CHARGE") :
+                    self.BillingCode.consume(self.JobSize, self.JobPrice)
+                    self.printInfo(_("Billing code %s was updated.") % self.BillingCode.BillingCode)
         except :    
             self.storage.rollbackTransaction()
@@ -1064 +1080 @@
         arguments[2] = self.UserName # in case it was overwritten by external script
         # TODO : do something about job-billing option, in case it was overwritten as well...
+        # TODO : do something about the job title : if we are printing a banner and the backend
+        # TODO : uses the job's title to name an output file (cups-pdf:// for example), we're stuck !
         
         self.logdebug("Starting original backend %s with args %s" % (originalbackend, " ".join(['"%s"' % a for a in arguments])))
@@ -1095 +1113 @@
         if os.WIFEXITED(status) :
             status = os.WEXITSTATUS(status)
+            message = "CUPS backend %s returned %d." % \
+                            (originalbackend, status)
             if status :
                 level = "error"
+                self.Reason = message
             else :    
                 level = "info"
-            self.printInfo("CUPS backend %s returned %d." % \
-                                     (originalbackend, status), level)
+            self.printInfo(message, level)
             return status
         elif not killed :
-            self.printInfo("CUPS backend %s died abnormally." % \
-                               originalbackend, "error")
+            self.Reason = "CUPS backend %s died abnormally." % originalbackend
+            self.printInfo(self.Reason, "error")
             return -1
         else :
-            self.printInfo("CUPS backend %s was killed." % \
-                               originalbackend, "warn")
+            self.Reason = "CUPS backend %s was killed." % originalbackend
+            self.printInfo(self.Reason, "warn")
             return 1
         

pykota/trunk/bin/waitprinter.sh

@@ -75 +75 @@
         ##log_msg "`ls -la /var/spool/{cups,samba}`"
         log_msg "Pykota Phase: ${PYKOTAPHASE}"
-        if [ x$PYKOTASTATUS != "xCANCELLED" ] && [ x$PYKOTAACTION != "xDENY" ] && [ x$PYKOTAPHASE = "xAFTER" ] ; then
+        if [ x$PYKOTASTATUS != "xCANCELLED" ] && [ x$PYKOTAACTION = "xALLOW" ] && [ x$PYKOTAPHASE = "xAFTER" ] ; then
                 printing_wait "${printer}"
         fi

pykota/trunk/cgi-bin/printquota.cgi

@@ -228 +228 @@
                         elif job.JobAction == "WARN" :    
                             oddevenclass = "warn"
+                        elif job.JobAction == "PROBLEM" :
+                            oddevenclass = "problem"
                         username_url = '<a href="%s?%s">%s</a>' % (os.environ.get("SCRIPT_NAME", ""), urllib.urlencode({"history" : 1, "username" : job.UserName}), job.UserName)
                         printername_url = '<a href="%s?%s">%s</a>' % (os.environ.get("SCRIPT_NAME", ""), urllib.urlencode({"history" : 1, "printername" : job.PrinterName}), job.PrinterName)

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.24alpha2 :
+    
+        - Introduce the "onbackenderror" directive in pykota.conf, to
+          control if the user must be charged or not whenever a real
+          CUPS backend fails. The default value is 'nocharge'.
+          Set it to 'charge' if you think your users can cause a CUPS
+          backend to fail.
+          
+        - Now mark original backends related problems as such in the 
+          printing history. Modified printquota.cgi and pykota.css
+          to make them be more visible.
+          
     - 1.24alpha1 :
     

pykota/trunk/pykota/accounters/pjl.py

@@ -173 +173 @@
         try :
             if (os.environ.get("PYKOTASTATUS") != "CANCELLED") and \
-               (os.environ.get("PYKOTAACTION") != "DENY") and \
+               (os.environ.get("PYKOTAACTION") == "ALLOW") and \
                (os.environ.get("PYKOTAPHASE") == "AFTER") and \
                self.parent.filter.JobSizeBytes :

pykota/trunk/pykota/accounters/snmp.py

@@ -175 +175 @@
             try :
                 if (os.environ.get("PYKOTASTATUS") != "CANCELLED") and \
-                   (os.environ.get("PYKOTAACTION") != "DENY") and \
+                   (os.environ.get("PYKOTAACTION") == "ALLOW") and \
                    (os.environ.get("PYKOTAPHASE") == "AFTER") and \
                    self.parent.filter.JobSizeBytes :

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.24alpha1_unofficial"
+__version__ = "1.24alpha2_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."

pykota/trunk/stylesheets/pykota.css

@@ -40 +40 @@
       }
       
+.problem {     
+        background-color: #DEBDEB;
+      }
+      
 .pykotacolsheader {      
         background-color: #AAAAAA;