Changeset 825

Timestamp:

02/28/03 00:48:41 (21 years ago)

Author:

jalet

Message:

Correctly maps PyKota's log levels to syslog log levels

Location:

pykota/trunk

Files:

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

pykota/trunk/bin/edpykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.24  2003/02/27 23:48:41  jalet
+# Correctly maps PyKota's log levels to syslog log levels
+#
 # Revision 1.23  2003/02/27 22:55:20  jalet
 # WARN log priority doesn't exist.
@@ -212 +215 @@
         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), "info")
+            self.logger.log_message(_("Hard limit %i is less than soft limit %i, values will be exchanged.") % (hardlimit, softlimit))
             (softlimit, hardlimit) = (hardlimit, softlimit)
         if not names :    

pykota/trunk/bin/pykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.12  2003/02/27 23:48:41  jalet
+# Correctly maps PyKota's log levels to syslog log levels
+#
 # Revision 1.11  2003/02/27 22:55:20  jalet
 # WARN log priority doesn't exist.
@@ -121 +124 @@
     except PyKotaRequesterError, msg :
         # can't get actual page counter, assume printer is off, but warns in log
-        kotafilter.logger.log_message(msg, "err")
+        kotafilter.logger.log_message(msg, "warn")
         printerIsOff = 1
     else :    
@@ -131 +134 @@
         # 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, "info")
+        kotafilter.logger.log_message(_("Printer %s not registered in the PyKota system") % kotafilter.printername)
     else :    
         # get last values from Quota Storage

pykota/trunk/pykota/loggers/system.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.4  2003/02/27 23:48:41  jalet
+# Correctly maps PyKota's log levels to syslog log levels
+#
 # Revision 1.3  2003/02/27 22:55:20  jalet
 # WARN log priority doesn't exist.
@@ -32 +35 @@
 class Logger :
     """A logger class which logs to syslog."""
+    levels = { "error" : "ERR", "warn": "WARNING", "info": "INFO", "debug": "DEBUG" }
     def __init__(self) :
         """Opens the logging subsystem."""
@@ -42 +46 @@
     def log_message(self, message, level="info") :
         """Sends the message to syslog."""
-        priority = getattr(syslog, "LOG_%s" % level.upper(), syslog.LOG_DEBUG)
+        priority = getattr(syslog, "LOG_%s" % self.levels.get(level.lower(), "DEBUG").upper(), syslog.LOG_DEBUG)
         syslog.syslog(priority, message)

pykota/trunk/pykota/tool.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.24  2003/02/27 23:48:41  jalet
+# Correctly maps PyKota's log levels to syslog log levels
+#
 # Revision 1.23  2003/02/27 22:55:20  jalet
 # WARN log priority doesn't exist.
@@ -254 +257 @@
             else :    
                 action = "DENY"
-            self.logger.log_message(_("Unable to match user %s on printer %s, applying default policy (%s)") % (username, printername, action), "info")
+            self.logger.log_message(_("Unable to match user %s on printer %s, applying default policy (%s)") % (username, printername, action))
             return (action, None, None)
         else :