Changeset 824

Timestamp:

02/27/03 23:55:20 (21 years ago)

Author:

jalet

Message:

WARN log priority doesn't exist.

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (2 diffs)
• bin/pykota (modified) (3 diffs)
• pykota/loggers/system.py (modified) (2 diffs)
• pykota/tool.py (modified) (2 diffs)

pykota/trunk/bin/edpykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.23  2003/02/27 22:55:20  jalet
+# WARN log priority doesn't exist.
+#
 # Revision 1.22  2003/02/27 09:37:02  jalet
 # Wildcards seem to work now
@@ -209 +212 @@
         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), "warn")
+            self.logger.log_message(_("Hard limit %i is less than soft limit %i, values will be exchanged.") % (hardlimit, softlimit), "info")
             (softlimit, hardlimit) = (hardlimit, softlimit)
         if not names :    

pykota/trunk/bin/pykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.11  2003/02/27 22:55:20  jalet
+# WARN log priority doesn't exist.
+#
 # Revision 1.10  2003/02/27 22:43:21  jalet
 # Missing import
@@ -118 +121 @@
     except PyKotaRequesterError, msg :
         # can't get actual page counter, assume printer is off, but warns in log
-        kotafilter.logger.log_message(msg, "warn")
+        kotafilter.logger.log_message(msg, "err")
         printerIsOff = 1
     else :    
@@ -128 +131 @@
         # The printer is unknown from the Quota Storage perspective
         # we let the job pass through, but log a warning message
-        kotafilter.logger.log_message(_("Printer %s not registered in the PyKota system") % kotafilter.printername, "warn")
+        kotafilter.logger.log_message(_("Printer %s not registered in the PyKota system") % kotafilter.printername, "info")
     else :    
         # get last values from Quota Storage

pykota/trunk/pykota/loggers/system.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.3  2003/02/27 22:55:20  jalet
+# WARN log priority doesn't exist.
+#
 # Revision 1.2  2003/02/05 23:47:54  jalet
 # Forgotten default argument
@@ -39 +42 @@
     def log_message(self, message, level="info") :
         """Sends the message to syslog."""
-        try :
-            priority = getattr(syslog, "LOG_%s" % level.upper())
-        except AttributeError :    
-            # Bad priority name, we log this as a DEBUG message
-            priority = syslog.LOG_DEBUG
+        priority = getattr(syslog, "LOG_%s" % level.upper(), syslog.LOG_DEBUG)
         syslog.syslog(priority, message)

pykota/trunk/pykota/tool.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.23  2003/02/27 22:55:20  jalet
+# WARN log priority doesn't exist.
+#
 # Revision 1.22  2003/02/27 09:09:20  jalet
 # Added a method to match strings against wildcard patterns
@@ -251 +254 @@
             else :    
                 action = "DENY"
-            self.logger.log_message(_("Unable to match user %s on printer %s, applying default policy (%s)") % (username, printername, action), "warn")
+            self.logger.log_message(_("Unable to match user %s on printer %s, applying default policy (%s)") % (username, printername, action), "info")
             return (action, None, None)
         else :