Changeset 1584 for pykota/trunk

Timestamp:

07/01/04 21:56:43 (20 years ago)

Author:

jalet

Message:

Better dispatching of error messages

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (5 diffs)
• bin/edpykota (modified) (8 diffs)
• bin/pkhint (modified) (3 diffs)
• bin/pkprinters (modified) (2 diffs)
• bin/pykotme (modified) (2 diffs)
• NEWS (modified) (1 diff)
• pykota/accounters/hardware.py (modified) (5 diffs)
• pykota/accounters/software.py (modified) (6 diffs)
• pykota/storages/ldapstorage.py (modified) (3 diffs)
• pykota/tool.py (modified) (18 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.66  2004/07/01 19:56:25  jalet
+# Better dispatching of error messages
+#
 # Revision 1.65  2004/06/22 09:31:17  jalet
 # Always send some debug info to CUPS' back channel stream (stderr) as
@@ -381 +384 @@
             # 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")
+                self.printInfo(_("Job contains no data. Printing is denied."), "warn")
                 action = "DENY"
             
@@ -446 +449 @@
             pollobj.unregister(fileno)
         except KeyError :    
-            self.logger.log_message(_("File number %s unregistered twice from polling object, ignored.") % fileno, "warn")
+            self.printInfo(_("File number %s unregistered twice from polling object, ignored.") % fileno, "warn")
         except :    
             self.logdebug("Error while unregistering file number %s from polling object." % fileno)
@@ -471 +474 @@
     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()
+        self.printInfo("PyKota (PID %s) : %s" % (os.getpid(), message.strip()))
         
     def handleData(self) :                    
@@ -651 +653 @@
             retcode = os.WEXITSTATUS(status)
         elif not killed :    
-            self.logger.log_message(_("CUPS backend %s died abnormally.") % realbackend, "error")
+            self.printInfo(_("CUPS backend %s died abnormally.") % realbackend, "error")
             retcode = -1
         else :    

pykota/trunk/bin/edpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.76  2004/07/01 19:56:40  jalet
+# Better dispatching of error messages
+#
 # Revision 1.75  2004/06/18 13:34:47  jalet
 # Now all tracebacks include PyKota's version number
@@ -463 +466 @@
             if (softlimit is not None) and (hardlimit is not None) and (hardlimit < softlimit) :        
                 # error, exchange them
-                self.logger.log_message(_("Hard limit %i is less than soft limit %i, values will be exchanged.") % (hardlimit, softlimit))
+                self.printInfo(_("Hard limit %i is less than soft limit %i, values will be exchanged.") % (hardlimit, softlimit))
                 (softlimit, hardlimit) = (hardlimit, softlimit)
             
@@ -541 +544 @@
                     protoquota = getattr(self.storage, "get%sPQuota" % suffix)(protoentry, printer)
                     if not protoquota.Exists :
-                        self.logger.log_message(_("Prototype %s not found in Quota Storage for printer %s.") % (protoentry.Name, printer.Name))
+                        self.printInfo(_("Prototype %s not found in Quota Storage for printer %s.") % (protoentry.Name, printer.Name))
                         continue    # skip this printer
                     else :    
                         (softlimit, hardlimit) = (protoquota.SoftLimit, protoquota.HardLimit)
                 else :        
-                    self.logger.log_message(_("Prototype object %s not found in Quota Storage.") % protoentry.Name)
+                    self.printInfo(_("Prototype object %s not found in Quota Storage.") % protoentry.Name)
                     
             if not options["noquota"] :    
@@ -552 +555 @@
                     hardlimit = softlimit
                     if hardlimit is not None :
-                        self.logger.log_message(_("Undefined hard limit set to soft limit (%s) on printer %s.") % (str(hardlimit), printer.Name))
+                        self.printInfo(_("Undefined hard limit set to soft limit (%s) on printer %s.") % (str(hardlimit), printer.Name))
                 if softlimit is None :    
                     softlimit = hardlimit
                     if softlimit is not None :
-                        self.logger.log_message(_("Undefined soft limit set to hard limit (%s) on printer %s.") % (str(softlimit), printer.Name))
+                        self.printInfo(_("Undefined soft limit set to hard limit (%s) on printer %s.") % (str(softlimit), printer.Name))
                         
             if options["add"] :    
@@ -568 +571 @@
                         (name, email) = splitname
                         if email and (email.count('@') != 1) :
-                            self.logger.log_message(_("Invalid email address %s") % email)
+                            self.printInfo(_("Invalid email address %s") % email)
                             email = ""
                     entry = getattr(self.storage, "get%s" % suffix)(name)
@@ -595 +598 @@
                         else :    
                             if options["groups"] :
-                                self.logger.log_message(_("Invalid group name %s") % entry.Name)
+                                self.printInfo(_("Invalid group name %s") % entry.Name)
                             else :    
-                                self.logger.log_message(_("Invalid user name %s") % entry.Name)
+                                self.printInfo(_("Invalid user name %s") % entry.Name)
                 elif options["delete"] :                
                     todelete[entry.Name] = entry
@@ -607 +610 @@
                         
                 if not entrypquota.Exists :     
-                    self.logger.log_message(_("Quota not found for object %s on printer %s.") % (entry.Name, printer.Name))
+                    self.printInfo(_("Quota not found for object %s on printer %s.") % (entry.Name, printer.Name))
                 else :    
                     if options["noquota"] or options["prototype"] or ((softlimit is not None) and (hardlimit is not None)) :
@@ -640 +643 @@
                                     changed[entry.Name]["ingroups"].append(groupname)
                                 else :
-                                    self.logger.log_message(_("Group %s not found in the PyKota Storage.") % groupname)
+                                    self.printInfo(_("Group %s not found in the PyKota Storage.") % groupname)
                                     
                     # This line disabled to prevent sending of unwanted email                 

pykota/trunk/bin/pkhint

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.14  2004/07/01 19:56:40  jalet
+# Better dispatching of error messages
+#
 # Revision 1.13  2004/06/29 07:55:18  jalet
 # Doesn't output the warning message when --help or --version is asked
@@ -226 +229 @@
                 device = self.extractDeviceFromURI(deviceuri)
                 if devicetype is None :
-                    sys.stderr.write("Unknown device %s for printer %s\n" % (device, printer))
+                    self.printInfo(_("Unknown device %s for printer %s") % (device, printer))
                 elif devicetype == "network" :
                     try :
@@ -245 +248 @@
                         else :    
                             configuration.append((printer, "software(/usr/bin/pkpgcounter)"))
-                # elif devicetype == "direct" : 
-                #    sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer))
-                #elif devicetype == "serial" : 
-                #    sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer))
-                #else :
-                #    sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer))
                 else :
                     configuration.append((printer, "software(/usr/bin/pkpgcounter)"))

pykota/trunk/bin/pkprinters

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.13  2004/07/01 19:56:41  jalet
+# Better dispatching of error messages
+#
 # Revision 1.12  2004/07/01 17:45:47  jalet
 # Added code to handle the description field for printers
@@ -197 +200 @@
                 if printer.Exists :
                     if options["skipexisting"] :
-                        self.printError(_("Printer %s already exists, skipping.") % printer.Name)
+                        self.printInfo(_("Printer %s already exists, skipping.") % printer.Name)
                     else :    
-                        self.printError(_("Printer %s already exists, will be modified.") % printer.Name)
+                        self.printInfo(_("Printer %s already exists, will be modified.") % printer.Name)
                         printers.append(printer)
                 else :

pykota/trunk/bin/pykotme

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.13  2004/07/01 19:56:42  jalet
+# Better dispatching of error messages
+#
 # Revision 1.12  2004/06/18 13:34:49  jalet
 # Now all tracebacks include PyKota's version number
@@ -151 +154 @@
                 totalsize += parser.getJobSize()
             except PDLAnalyzerError, msg :    
-                sys.stderr.write("%s\n" % msg)
-                sys.stderr.flush()
+                self.printInfo(msg)
             
         # get current user

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.19alpha29 : 
+    
+        - Correctly dispatches error messages depending on the
+          situation : tools which can be run interactively will
+          ALWAYS output their logs to stderr, excepted for
+          their DEBUG messages, for which the "logger:"
+          directive as set in pykota.conf will be honored.
+          Tools which can't be run interactively will ALWAYS
+          honor the "logger:" directive as set in pykota.conf
+          
     - 1.19alpha28 :
     

pykota/trunk/pykota/accounters/hardware.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.6  2004/07/01 19:56:42  jalet
+# Better dispatching of error messages
+#
 # Revision 1.5  2004/06/10 22:42:06  jalet
 # Better messages in logs
@@ -60 +63 @@
             # can't get actual page counter, assume printer is off or warming up
             # log the message anyway.
-            self.filter.logger.log_message("%s" % msg, "warn")
+            self.filter.printInfo("%s" % msg, "warn")
             counter = None
         self.filter.logdebug("Printer's internal page counter value is : %s" % str(counter))
@@ -106 +109 @@
         if printer is None :
             raise PyKotaAccounterError, _("Unknown printer address in HARDWARE(%s) for printer %s") % (commandline, self.filter.printername)
-        self.filter.logger.log_message(_("Launching HARDWARE(%s)...") % commandline, "info")
+        self.filter.printInfo(_("Launching HARDWARE(%s)...") % commandline)
         error = 1
         pagecounter = None
@@ -114 +117 @@
             pagecounter = int(line.strip())
         except ValueError :    
-            self.filter.logger.log_message(_("Incorrect answer : %s") % repr(line), "error")
+            self.filter.printInfo(_("Incorrect answer : %s") % repr(line), "error")
         except IOError :    
             # we were interrupted by a signal, certainely a SIGTERM
@@ -122 +125 @@
             except :    
                 pass # already killed ?
-            self.filter.logger.log_message(_("SIGTERM was sent to hardware accounter %s (pid: %s)") % (commandline, child.pid), "info")
+            self.filter.printInfo(_("SIGTERM was sent to hardware accounter %s (pid: %s)") % (commandline, child.pid))
         else :    
             error = 0

pykota/trunk/pykota/accounters/software.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.6  2004/07/01 19:56:43  jalet
+# Better dispatching of error messages
+#
 # Revision 1.5  2004/06/10 22:42:06  jalet
 # Better messages in logs
@@ -49 +52 @@
     def computeJobSize(self) :    
         """Feeds an external command with our datas to let it compute the job size, and return its value."""
-        self.filter.logger.log_message(_("Launching SOFTWARE(%s)...") % self.arguments, "info")
+        self.filter.printInfo(_("Launching SOFTWARE(%s)...") % self.arguments)
         MEGABYTE = 1024*1024
         self.filter.jobdatastream.seek(0)
@@ -62 +65 @@
         except (IOError, OSError), msg :    
             msg = "%s : %s" % (self.arguments, msg) 
-            self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % msg)
+            self.filter.printInfo(_("Unable to compute job size with accounter %s") % msg)
         
         pagecount = 0
@@ -68 +71 @@
             pagecount = int(child.fromchild.readline().strip())
         except (AttributeError, ValueError) :
-            self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % self.arguments)
+            self.filter.printInfo(_("Unable to compute job size with accounter %s") % self.arguments)
         except (IOError, OSError), msg :    
             msg = "%s : %s" % (self.arguments, msg) 
-            self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % msg)
+            self.filter.printInfo(_("Unable to compute job size with accounter %s") % msg)
         child.fromchild.close()
         
@@ -77 +80 @@
             retcode = child.wait()
         except OSError, msg :    
-            self.filter.logger.log_message(_("Problem while waiting for software accounter pid %s to exit : %s") % (child.pid, msg))
+            self.filter.printInfo(_("Problem while waiting for software accounter pid %s to exit : %s") % (child.pid, msg))
         else :    
             if os.WIFEXITED(retcode) :
@@ -83 +86 @@
             else :    
                 status = retcode
-            self.filter.logger.log_message(_("Software accounter %s exit code is %s") % (self.arguments, repr(retcode)))
+            self.filter.printInfo(_("Software accounter %s exit code is %s") % (self.arguments, repr(retcode)))
         self.filter.logdebug("Software accounter %s said job is %s pages long." % (self.arguments, pagecount))
         return pagecount    

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.72  2004/07/01 19:56:43  jalet
+# Better dispatching of error messages
+#
 # Revision 1.71  2004/07/01 17:45:49  jalet
 # Added code to handle the description field for printers
@@ -805 +808 @@
                 message = _("Unable to find an existing objectClass %s entry with %s=%s to attach pykotaAccount objectClass") % (where, self.info["userrdn"], user.Name)
                 if action.lower() == "warn" :    
-                    self.tool.logger.log_message("%s. A new entry will be created instead." % message, "warn")
+                    self.tool.printInfo("%s. A new entry will be created instead." % message, "warn")
                 else : # 'fail' or incorrect setting
                     raise PyKotaStorageError, "%s. Action aborted. Please check your configuration." % message
@@ -841 +844 @@
                 message = _("Unable to find an existing entry to attach pykotaGroup objectclass %s") % group.Name
                 if action.lower() == "warn" :    
-                    self.tool.logger.log_message("%s. A new entry will be created instead." % message, "warn")
+                    self.tool.printInfo("%s. A new entry will be created instead." % message, "warn")
                 else : # 'fail' or incorrect setting
                     raise PyKotaStorageError, "%s. Action aborted. Please check your configuration." % message

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.110  2004/07/01 19:56:42  jalet
+# Better dispatching of error messages
+#
 # Revision 1.109  2004/07/01 17:45:49  jalet
 # Added code to handle the description field for printers
@@ -451 +454 @@
         except (locale.Error, IOError) :
             gettext.NullTranslations().install()
-            # sys.stderr.write("PyKota : Error while loading translations\n")
     
         # pykota specific stuff
@@ -479 +481 @@
             self.logger.log_message(message, "debug")
             
-    def printError(self, message) :        
+    def printInfo(self, message, level="info") :        
         """Sends a message to standard error."""
-        sys.stderr.write("%s\n" % message)
+        sys.stderr.write("%s: %s\n" % (level.upper(), message))
         sys.stderr.flush()
         
@@ -577 +579 @@
                 self.display_usage_and_quit()
         except getopt.error, msg :
-            sys.stderr.write("%s\n" % msg)
-            sys.stderr.flush()
+            self.printInfo(msg)
             self.display_usage_and_quit()
         return (parsed, args)
@@ -607 +608 @@
             server = smtplib.SMTP(self.smtpserver)
         except socket.error, msg :    
-            self.logger.log_message(_("Impossible to connect to SMTP server : %s") % msg, "error")
+            self.printInfo(_("Impossible to connect to SMTP server : %s") % msg, "error")
         else :
             try :
@@ -613 +614 @@
             except smtplib.SMTPException, answer :    
                 for (k, v) in answer.recipients.items() :
-                    self.logger.log_message(_("Impossible to send mail to %s, error %s : %s") % (k, v[0], v[1]), "error")
+                    self.printInfo(_("Impossible to send mail to %s, error %s : %s") % (k, v[0], v[1]), "error")
             server.quit()
         
@@ -640 +641 @@
             else :    
                 action = "POLICY_DENY"
-            self.logger.log_message(_("Unable to match user %s on printer %s, applying default policy (%s)") % (user.Name, printer.Name, action))
+            self.printInfo(_("Unable to match user %s on printer %s, applying default policy (%s)") % (user.Name, printer.Name, action))
         else :    
             pagecounter = int(userpquota.PageCounter or 0)
@@ -769 +770 @@
                 else :    
                     action = "POLICY_DENY"
-                self.logger.log_message(_("Unable to find user %s's account balance, applying default policy (%s) for printer %s") % (user.Name, action, printer.Name))
+                self.printInfo(_("Unable to find user %s's account balance, applying default policy (%s) for printer %s") % (user.Name, action, printer.Name))
                 return action        
             else :    
@@ -830 +831 @@
         if action == "DENY" :
             adminmessage = _("Print Quota exceeded for group %s on printer %s") % (group.Name, printer.Name)
-            self.logger.log_message(adminmessage)
+            self.printInfo(adminmessage)
             if mailto in [ "BOTH", "ADMIN" ] :
                 self.sendMessageToAdmin(adminmail, _("Print Quota"), adminmessage)
@@ -841 +842 @@
         elif action == "WARN" :    
             adminmessage = _("Print Quota low for group %s on printer %s") % (group.Name, printer.Name)
-            self.logger.log_message(adminmessage)
+            self.printInfo(adminmessage)
             if mailto in [ "BOTH", "ADMIN" ] :
                 self.sendMessageToAdmin(adminmail, _("Print Quota"), adminmessage)
@@ -868 +869 @@
         if action == "DENY" :
             adminmessage = _("Print Quota exceeded for user %s on printer %s") % (user.Name, printer.Name)
-            self.logger.log_message(adminmessage)
+            self.printInfo(adminmessage)
             if mailto in [ "BOTH", "USER", "EXTERNAL" ] :
                 message = self.config.getHardWarn(printer.Name)
@@ -879 +880 @@
         elif action == "WARN" :    
             adminmessage = _("Print Quota low for user %s on printer %s") % (user.Name, printer.Name)
-            self.logger.log_message(adminmessage)
+            self.printInfo(adminmessage)
             if mailto in [ "BOTH", "USER", "EXTERNAL" ] :
                 if user.LimitBy and (user.LimitBy.lower() == "balance") : 
@@ -980 +981 @@
             # computation is just an indication of what the
             # job's size MAY be.
-            self.logger.log_message(_("Unable to precompute the job's size with the generic PDL analyzer : %s") % msg, "warn")
+            self.printInfo(_("Unable to precompute the job's size with the generic PDL analyzer : %s") % msg, "warn")
             return 0
         else :    
@@ -994 +995 @@
         self.gotSigTerm = 1
         os.environ["PYKOTASTATUS"] = "CANCELLED"
-        self.logger.log_message(_("SIGTERM received, job %s cancelled.") % self.jobid, "info")
+        self.printInfo(_("SIGTERM received, job %s cancelled.") % self.jobid)
         
     def exportJobInfo(self) :    
@@ -1035 +1036 @@
             self.logdebug("Executing post-hook [%s]" % posthook)
             os.system(posthook)
+        
+    def printInfo(self, message, level="info") :        
+        """Sends a message to standard error."""
+        self.logger.log_message("%s" % message, level)
         
     def extractInfoFromCupsOrLprng(self) :    
@@ -1098 +1103 @@
                 Kseen = 1       # we assume the user wants at least one copy...
             if (rseen is None) and jseen and Pseen and nseen :    
-                self.logger.log_message(_("Printer hostname undefined, set to 'localhost'"), "warn")
+                self.printInfo(_("Printer hostname undefined, set to 'localhost'"), "warn")
                 rseen = "localhost"
             if jseen and Pseen and nseen and rseen :        
                 # job is always in stdin (None)
                 return ("LPRNG", rseen, Pseen, nseen, jseen, None, Kseen, None, None, None)
-        self.logger.log_message(_("Printing system unknown, args=%s") % " ".join(sys.argv), "warn")
+        self.printInfo(_("Printing system unknown, args=%s") % " ".join(sys.argv), "warn")
         return (None, None, None, None, None, None, None, None, None, None)   # Unknown printing system
         
@@ -1134 +1139 @@
                 commandline = self.formatCommandLine(args, user, printer)
                 if not printer.Exists :
-                    self.logger.log_message(_("Printer %s not registered in the PyKota system, applying external policy (%s) for printer %s") % (self.printername, commandline, self.printername), "info")
+                    self.printInfo(_("Printer %s not registered in the PyKota system, applying external policy (%s) for printer %s") % (self.printername, commandline, self.printername))
                 if not user.Exists :
-                    self.logger.log_message(_("User %s not registered in the PyKota system, applying external policy (%s) for printer %s") % (self.username, commandline, self.printername), "info")
+                    self.printInfo(_("User %s not registered in the PyKota system, applying external policy (%s) for printer %s") % (self.username, commandline, self.printername))
                 if not userpquota.Exists :
-                    self.logger.log_message(_("User %s doesn't have quota on printer %s in the PyKota system, applying external policy (%s) for printer %s") % (self.username, self.printername, commandline, self.printername), "info")
+                    self.printInfo(_("User %s doesn't have quota on printer %s in the PyKota system, applying external policy (%s) for printer %s") % (self.username, self.printername, commandline, self.printername))
                 if os.system(commandline) :
-                    self.logger.log_message(_("External policy %s for printer %s produced an error. Job rejected. Please check PyKota's configuration files.") % (commandline, self.printername), "error")
+                    self.printInfo(_("External policy %s for printer %s produced an error. Job rejected. Please check PyKota's configuration files.") % (commandline, self.printername), "error")
                     policy = "EXTERNALERROR"
                     break
             else :        
                 if not printer.Exists :
-                    self.logger.log_message(_("Printer %s not registered in the PyKota system, applying default policy (%s)") % (self.printername, policy), "info")
+                    self.printInfo(_("Printer %s not registered in the PyKota system, applying default policy (%s)") % (self.printername, policy))
                 if not user.Exists :
-                    self.logger.log_message(_("User %s not registered in the PyKota system, applying default policy (%s) for printer %s") % (self.username, policy, self.printername), "info")
+                    self.printInfo(_("User %s not registered in the PyKota system, applying default policy (%s) for printer %s") % (self.username, policy, self.printername))
                 if not userpquota.Exists :
-                    self.logger.log_message(_("User %s doesn't have quota on printer %s in the PyKota system, applying default policy (%s)") % (self.username, self.printername, policy), "info")
+                    self.printInfo(_("User %s doesn't have quota on printer %s in the PyKota system, applying default policy (%s)") % (self.username, self.printername, policy))
                 break
         if policy == "EXTERNAL" :    
             if not printer.Exists :
-                self.logger.log_message(_("Printer %s still not registered in the PyKota system, job will be rejected") % self.printername, "info")
+                self.printInfo(_("Printer %s still not registered in the PyKota system, job will be rejected") % self.printername)
             if not user.Exists :
-                self.logger.log_message(_("User %s still not registered in the PyKota system, job will be rejected on printer %s") % (self.username, self.printername), "info")
+                self.printInfo(_("User %s still not registered in the PyKota system, job will be rejected on printer %s") % (self.username, self.printername))
             if not userpquota.Exists :
-                self.logger.log_message(_("User %s still doesn't have quota on printer %s in the PyKota system, job will be rejected") % (self.username, self.printername), "info")
+                self.printInfo(_("User %s still doesn't have quota on printer %s in the PyKota system, job will be rejected") % (self.username, self.printername))
         return (policy, printer, user, userpquota)
         
@@ -1177 +1182 @@
         else :
             if policy not in ("OK", "ALLOW") :
-                self.logger.log_message(_("Invalid policy %s for printer %s") % (policy, self.printername))
+                self.printInfo(_("Invalid policy %s for printer %s") % (policy, self.printername))
                 return self.removeJob()
             else :

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.19alpha28_unofficial"
+__version__ = "1.19alpha29_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""