[Csp-commits] svn:csp r1436 - in trunk/CSP/SimData: . SimData

[<sv...@ww...>]

Author: mkrose
Date: 2005-01-03 13:55:13 -0800 (Mon, 03 Jan 2005)
New Revision: 1436

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/SimData/Compile.py
Log:
Fix logging priority/category calls in Compile.py.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1436

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2005-01-03 10:38:31 UTC (rev 1435)
+++ trunk/CSP/SimData/CHANGES.current	2005-01-03 21:55:13 UTC (rev 1436)
@@ -1,6 +1,9 @@
 Version 0.4.0 (in progress)
 ===========================
 
+2005-01-03: onsight
+ * Fix logging priority/category calls in Compile.py.
+
 2004-12-23: delta
  * Latest version of pthreads for win changed the type of pthread_t.
    A small wrapper for Task:ThreadId is provided to garanty compatibility 
@@ -11,7 +14,7 @@
 2004-12-12: delta
  * Fixed a few warnings in Random.h under msvc. Hopefully gcc 
    won't complain.
-   
+
   * Updated Config project file.
 
 2004-12-11: onsight

Modified: trunk/CSP/SimData/SimData/Compile.py
===================================================================
--- trunk/CSP/SimData/SimData/Compile.py	2005-01-03 10:38:31 UTC (rev 1435)
+++ trunk/CSP/SimData/SimData/Compile.py	2005-01-03 21:55:13 UTC (rev 1436)
@@ -37,7 +37,8 @@
 		print "more information or ask for help on the forums at"
 		print "http://csp.sourcforge.net/forum"
 		sys.exit(1)
-	SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_ALERT)
+	SimData.log().setLogPriority(SimData.LOG_ALERT)
+	SimData.log().setLogCategory(SimData.LOG_ALL)
 	original_path = sys.path[:]
 	new_path = ""
 	try:
@@ -214,7 +215,8 @@
 						self.usage("invalid option '%s'" % arg)
 					setWarningLevel(level)
 					if level > 0:
-						SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_WARNING)
+						SimData.log().setLogPriority(SimData.LOG_WARNING)
+						SimData.log().setLogCategory(SimData.LOG_ALL)
 				elif arg.startswith('--debug='):
 					try:
 						level = int(arg[8:])
@@ -222,9 +224,11 @@
 						self.usage("invalid option '%s'" % arg)
 					setDebugLevel(level)
 					if level > 1:
-						SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_TRACE)
+						SimData.log().setLogPriority(SimData.LOG_TRACE)
+						SimData.log().setLogCategory(SimData.LOG_ALL)
 					elif level > 0:
-						SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_DEBUG)
+						SimData.log().setLogPriority(SimData.LOG_DEBUG)
+						SimData.log().setLogCategory(SimData.LOG_ALL)
 				elif arg == '--rebuild':
 					self.rebuild = 1
 				elif arg == '--force':