[Csp-commits] svn:csp r1678 - trunk/CSP/CSPSim/Bin

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

Author: mkrose
Date: 2005-11-19 13:47:20 -0800 (Sat, 19 Nov 2005)
New Revision: 1678

Modified:
   trunk/CSP/CSPSim/Bin/CSPSim.py
Log:
Fix CSPSim.py to work with the recent logging changes (forgot to
include this file in a previous checkin).

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

Modified: trunk/CSP/CSPSim/Bin/CSPSim.py
===================================================================
--- trunk/CSP/CSPSim/Bin/CSPSim.py	2005-11-19 19:29:23 UTC (rev 1677)
+++ trunk/CSP/CSPSim/Bin/CSPSim.py	2005-11-19 21:47:20 UTC (rev 1678)
@@ -102,14 +102,13 @@
 				flags = flags | class_flag
 		except:
 			print "Unrecognized log class:", class_name
-	cCSP.csplog().setLogCategory(flags)
+	cCSP.csplog().setCategories(flags)
 
 
 def setLogPriority():
-	cCSP.csplog().setTimeLogging(1)
 	if log_priority is None: return
-	cCSP.csplog().setLogPriority(log_priority)
-	SimData.log().setLogPriority(log_priority)
+	cCSP.csplog().setPriority(log_priority)
+	SimData.log().setPriority(log_priority)
 
 
 def parseLogPriority(priority):
@@ -176,8 +175,8 @@
 	cachepath = cCSP.getCachePath()
 	dar = os.path.join(cachepath, "sim.dar")
 	XML = os.path.join(datapath, "XML")
-	cCSP.csplog().setLogCategory(cCSP.CSP_ALL)
-	cCSP.csplog().setLogPriority(SimData.LOG_ALERT)
+	cCSP.csplog().setCategories(cCSP.CSP_ALL)
+	cCSP.csplog().setPriority(SimData.LOG_ERROR)
 	#print "compile %s %s" % (XML, dar)
 	try:
 		from CSP.SimData.Compile import Compiler, CompilerUsageError
@@ -346,8 +345,8 @@
 			print "Invalid logging priority, using .ini setting."
 
     # capture Object class registration and other errors when CSP loads
-	SimData.log().setLogCategory(SimData.LOG_ALL)
-	SimData.log().setLogPriority(SimData.LOG_DEBUG)
+	SimData.log().setCategories(SimData.LOG_ALL)
+	SimData.log().setPriority(SimData.LOG_DEBUG)
 
 	loadCSP()