[Oval-commits] r192 - trunk/oval-server

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-08-23 09:58:27 +0000 (Thu, 23 Aug 2007)
New Revision: 192

Modified:
   trunk/oval-server/oval-server.cfg
   trunk/oval-server/oval-server.py
Log:
Implement setting of log_level from config file

Modified: trunk/oval-server/oval-server.cfg
===================================================================
--- trunk/oval-server/oval-server.cfg	2007-08-23 09:45:18 UTC (rev 191)
+++ trunk/oval-server/oval-server.cfg	2007-08-23 09:58:27 UTC (rev 192)
@@ -1,7 +1,8 @@
 [general]
 log_dir = /home/blaze/tmp/oval/server/log
 log_file = oval-server.log
-log_level = INFO
+#log_level = CRITICAL | ERROR | WARNING (default) | INFO | DEBUG | NOTSET
+log_level = INaFO
 dsa_storage = /home/blaze/tmp/oval/server/dsa
 db = /home/blaze/tmp/oval/server/oval-server.db
 

Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py	2007-08-23 09:45:18 UTC (rev 191)
+++ trunk/oval-server/oval-server.py	2007-08-23 09:58:27 UTC (rev 192)
@@ -117,6 +117,7 @@
 			
 			logdirname = self.config.get('general', 'log_dir')
 			logfilename = self.config.get('general', 'log_file')
+			self.log_level = self.config.get('general', 'log_level')
 			self.outfilename = os.path.join(logdirname, logfilename)
 			
 			# Create the root handler (removing any others)
@@ -125,7 +126,13 @@
 			for h in logging.root.handlers:
 				logging.root.removeHandler(h)
 			logging.root.addHandler(hdlr)
-			logging.root.setLevel(logging.DEBUG) #  config.get('server', 'log_level'))
+			
+			if logLevels.has_key(self.log_level):
+				logging.root.setLevel(logLevels[self.log_level])
+			else:
+				logging.root.setLevel(logging.WARNING)
+				self.logger.warning('Wrong value of log_level key in config. Use WARNING as default.')
+
 			self.logger.info('Logging begins')
 		
 		except IOError, e: