Changeset 1519 for pykota/trunk/bin

Timestamp:

06/04/04 00:12:53 (20 years ago)

Author:

jalet

Message:

Now denies empty jobs

Location:

pykota/trunk/bin

Files:

• cupspykota (modified) (3 diffs)
• waitprinter.sh (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.59  2004/06/03 22:12:53  jalet
+# Now denies empty jobs
+#
 # Revision 1.58  2004/06/03 21:50:33  jalet
 # Improved error logging.
@@ -340 +343 @@
             os.environ["PYKOTAPHASE"] = "BEFORE"
             
-            # checks the user's quota
+            # do we want strict or laxist quota enforcement ?
             if self.config.getPrinterEnforcement(printer.Name) == "STRICT" :
                 self.softwareJobSize = self.precomputeJobSize()
@@ -347 +350 @@
             os.environ["PYKOTAPRECOMPUTEDJOBSIZE"] = str(self.softwareJobSize)
             os.environ["PYKOTAPRECOMPUTEDJOBPRICE"] = str(self.softwareJobPrice)
+            
+            # checks the user's quota
             action = self.warnUserPQuota(userpquota)
+            
+            # if no data to pass to real backend, probably a filter
+            # higher in the chain failed because of a misconfiguration.
+            # we deny the job in this case (nothing to print anyway)
+            if not self.jobSizeBytes :
+                self.logger.log_message(_("Job contains no data. Printing is denied."), "warn")
+                action = "DENY"
             
             # exports some new environment variables

pykota/trunk/bin/waitprinter.sh

@@ -24 +24 @@
 # the printer would effectively never print again if the previous job
 # was already fully printed.
-if [ x$PYKOTAACTION != "xDENY" ] && [ x$PYKOTAPHASE == "xAFTER" ] && [ x$PYKOTAJOBSIZEBYTES != "x0" ] ; then
+if [ x$PYKOTAACTION != "xDENY" ] && [ x$PYKOTAPHASE == "xAFTER" ] ; then
   until snmpget -v1 -c public -Ov $1 HOST-RESOURCES-MIB::hrPrinterStatus.1 | grep -i printing >/dev/null; do
    sleep 1 ;