Changeset 1584 for pykota/trunk/pykota/tool.py

Timestamp:

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

Author:

jalet

Message:

Better dispatching of error messages

Files:

• pykota/trunk/pykota/tool.py (modified) (18 diffs)

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 :