Changeset 1562 for pykota/trunk/bin

Timestamp:

06/22/04 11:31:18 (20 years ago)

Author:

jalet

Message:

Always send some debug info to CUPS' back channel stream (stderr) as
informationnal messages.

Files:

• pykota/trunk/bin/cupspykota (modified) (16 diffs)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.65  2004/06/22 09:31:17  jalet
+# Always send some debug info to CUPS' back channel stream (stderr) as
+# informationnal messages.
+#
 # Revision 1.64  2004/06/18 13:34:46  jalet
 # Now all tracebacks include PyKota's version number
@@ -366 +370 @@
                 self.softwareJobSize = self.precomputeJobSize()
                 self.softwareJobPrice = userpquota.computeJobPrice(self.softwareJobSize)
-                self.logdebug("Precomputed job's size is %s pages, price is %s units" % (self.softwareJobSize, self.softwareJobPrice))
+                self.sendBackChannelData("Precomputed job's size is %s pages, price is %s units" % (self.softwareJobSize, self.softwareJobPrice))
             os.environ["PYKOTAPRECOMPUTEDJOBSIZE"] = str(self.softwareJobSize)
             os.environ["PYKOTAPRECOMPUTEDJOBPRICE"] = str(self.softwareJobPrice)
@@ -386 +390 @@
             self.prehook(userpquota)
             
-            self.logdebug("Job accounting begins.")
+            self.sendBackChannelData("Job accounting begins.")
             self.accounter.beginJob(userpquota)
         else :    
@@ -407 +411 @@
             # stops accounting. 
             self.accounter.endJob(userpquota)
-            self.logdebug("Job accounting ends.")
+            self.sendBackChannelData("Job accounting ends.")
                 
             # retrieve the job size    
             if action == "DENY" :
                 jobsize = 0
-                self.logdebug("Job size forced to 0 because printing is denied.")
+                self.sendBackChannelData("Job size forced to 0 because printing is denied.")
             else :    
                 jobsize = self.accounter.getJobSize()
-            self.logdebug("Job size : %i" % jobsize)
+            self.sendBackChannelData("Job size : %i" % jobsize)
             
             # update the quota for the current user on this printer 
-            self.logdebug("Updating user %s's quota on printer %s" % (user.Name, printer.Name))
+            self.sendBackChannelData("Updating user %s's quota on printer %s" % (user.Name, printer.Name))
             jobprice = userpquota.increasePagesUsage(jobsize)
             
             # adds the current job to history    
             printer.addJobToHistory(self.jobid, user, self.accounter.getLastPageCounter(), action, jobsize, jobprice, self.preserveinputfile, self.title, self.copies, self.options, clienthost, self.jobSizeBytes)
-            self.logdebug("Job added to history.")
+            self.sendBackChannelData("Job added to history.")
             
             # exports some new environment variables
@@ -465 +469 @@
         return "%s (%s)" % (fd, " | ".join(maskval))
         
+    def sendBackChannelData(self, message) :    
+        """Sends an informational message to CUPS via back channel stream (stderr)."""
+        sys.stderr.write("INFO: PyKota (PID %s) : %s\n" % (os.getpid(), message.strip()))
+        sys.stderr.flush()
+        
     def handleData(self) :                    
         """Pass the job's data to the real backend."""
@@ -471 +480 @@
         
         # And launch it
-        self.logdebug("Starting real backend %s with args %s" % (realbackend, " ".join(['"%s"' % a for a in ([os.environ["DEVICE_URI"]] + sys.argv[1:])])))
+        self.sendBackChannelData("Starting real backend %s with args %s" % (realbackend, " ".join(['"%s"' % a for a in ([os.environ["DEVICE_URI"]] + sys.argv[1:])])))
         subprocess = PyKotaPopen4([realbackend] + sys.argv[1:], bufsize=0, arg0=os.environ["DEVICE_URI"])
         
@@ -501 +510 @@
             # job's data is in a file, no need to pass the data
             # to the real backend
-            self.logdebug("Job's data is in %s" % self.preserveinputfile)
+            self.sendBackChannelData("Job's data is in %s" % self.preserveinputfile)
             infno = None
             endinput = 1
         
-        self.logdebug("Entering streams polling loop...")
+        self.sendBackChannelData("Entering streams polling loop...")
         MEGABYTE = 1024*1024
         killed = 0
@@ -521 +530 @@
                     self.logdebug("Error while sending signal to pid %s : %s" % (subprocess.pid, msg))
                 else :    
-                    self.logger.log_message(_("SIGTERM was sent to real backend %s (pid: %s)") % (realbackend, subprocess.pid), "info")
+                    self.sendBackChannelData(_("SIGTERM was sent to real backend %s (pid: %s)") % (realbackend, subprocess.pid))
                     killed = 1
             
@@ -531 +540 @@
                 availablefds = []
             if not availablefds :
-                self.logdebug("Nothing to do, sleeping a bit...")
+                self.sendBackChannelData("Nothing to do, sleeping a bit...")
                 time.sleep(0.01) # give some time to the system
             else :
@@ -548 +557 @@
                                         indata = ""
                                 else :        
-                                    self.logdebug("No data to send to real backend yet, sleeping a bit...")
+                                    self.sendBackChannelData("No data to send to real backend yet, sleeping a bit...")
                                     time.sleep(0.01)
                                     
                                 if endinput :    
                                     self.unregisterFileNo(pollster, tocfno)        
-                                    self.logdebug("Closing real backend's stdin.")
+                                    self.sendBackChannelData("Closing real backend's stdin.")
                                     os.close(tocfno)
                                     inputclosed = 1
@@ -585 +594 @@
                                     if not data :    # If yes, then no more input data
                                         self.unregisterFileNo(pollster, infno)
-                                        self.logdebug("Input data ends.")
+                                        self.sendBackChannelData("Input data ends.")
                                         endinput = 1 # this happens with real files.
                                     else :    
@@ -591 +600 @@
                                 elif fd == fromcfno :
                                     if not data :
-                                        self.logdebug("No back channel data to read from real backend yet, sleeping a bit...")
+                                        self.sendBackChannelData("No back channel data to read from real backend yet, sleeping a bit...")
                                         time.sleep(0.01)
                                     else :
@@ -606 +615 @@
                                 # Here we are in the case where the input file is stdin.
                                 # which has no more data to be read.
-                                self.logdebug("Input data ends.")
+                                self.sendBackChannelData("Input data ends.")
                                 endinput = 1
                             elif fd == fromcfno :    
                                 # We are no more interested in this file descriptor        
-                                self.logdebug("Closing real backend's stdout+stderr.")
+                                self.sendBackChannelData("Closing real backend's stdout+stderr.")
                                 os.close(fromcfno)
                                 endoutput = 1
@@ -618 +627 @@
                                 
                         if mask & select.POLLNVAL :        
-                            self.logdebug("File %s was closed. Unregistering from polling object." % fd)
+                            self.sendBackChannelData("File %s was closed. Unregistering from polling object." % fd)
                             self.unregisterFileNo(pollster, fd)
                     except IOError, msg :            
@@ -625 +634 @@
         # We must close the real backend's input stream
         if killed and not inputclosed :
-            self.logdebug("Forcing close of real backend's stdin.")
+            self.sendBackChannelData("Forcing close of real backend's stdin.")
             os.close(tocfno)
         
-        self.logdebug("Exiting streams polling loop...")
+        self.sendBackChannelData("Exiting streams polling loop...")
         
         # Check exit code of original CUPS backend.    
@@ -634 +643 @@
             # we exited the loop before the real backend exited
             # now we have to wait for it to finish and get its status
-            self.logdebug("Waiting for real backend to exit...")
+            self.sendBackChannelData("Waiting for real backend to exit...")
             try :
                 status = subprocess.wait()