Update of /cvsroot/btplusplus/BT++/src/WebServer
In directory sc8-pr-cvs1:/tmp/cvs-serv19222/WebServer
Modified Files:
BTWebServer.py
Log Message:
fixed & improved logging, fixed exit for stdin command
Index: BTWebServer.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/WebServer/BTWebServer.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BTWebServer.py 2 Mar 2003 16:36:27 -0000 1.5
--- BTWebServer.py 7 Mar 2003 23:42:16 -0000 1.6
***************
*** 77,100 ****
if loglevel >= int(HTTPConfig.Get('Display', 'LogLevel')):
log = {}
! log['TimeCode'] = strftime("[%a, %d %b %Y %H:%M:%S]", localtime())
! log['LogLevel'] = loglevel
! log['LogLevelTrivial'] = false
! log['LogLevelInfo'] = false
! log['LogLevelError'] = false
! log['LogLevelCritical'] = false
! if loglevel == LOG_TRIVIAL:
! log['LogLevelTrivial'] = true
! elif loglevel == LOG_INFO:
! log['LogLevelInfo'] = true
! elif loglevel == LOG_ERROR:
! log['LogLevelError'] = true
else:
! log['LogLevelCritical'] = true
! log['Entry'] = a
! WebLog.append( log )
if len(WebLog) > int(HTTPConfig.Get('Display', 'LogCount')):
! WebLog.remove( len(WebLog) - 1 )
BTHandler = LoaderManager(log = WebLogit)
###########################################################################################################
--- 77,148 ----
if loglevel >= int(HTTPConfig.Get('Display', 'LogLevel')):
log = {}
! if (len(WebLog)>1) and (WebLog[-1]['Count']>=1) and (WebLog[-2]['Entry']==a):
! WebLog[-1]['Count'] = WebLog[-1]['Count'] + 1
! WebLog[-1]['Entry'] = "Last entry repeated " + str(WebLog[-1]['Count']) + " times"
! WebLog[-1]['TimeCode'] = strftime("[%a, %d %b %Y %H:%M:%S]", localtime())
! ## log = WebLog[-1]
! ## log['Count'] = log['Count'] + 1
! ## log['Entry'] = "Last entry repeated " + log['Count'] + " times"
! ## log['TimeCode'] = strftime("[%a, %d %b %Y %H:%M:%S]", localtime())
! ## WebLog[-1] = log
! ## log['TimeCode'] = strftime("[%a, %d %b %Y %H:%M:%S]", localtime())
! ## log['LogLevel'] = loglevel
! ## log['LogLevelTrivial'] = false
! ## log['LogLevelInfo'] = false
! ## log['LogLevelError'] = false
! ## log['LogLevelCritical'] = false
! ## if loglevel == LOG_TRIVIAL:
! ## log['LogLevelTrivial'] = true
! ## elif loglevel == LOG_INFO:
! ## log['LogLevelInfo'] = true
! ## elif loglevel == LOG_ERROR:
! ## log['LogLevelError'] = true
! ## else:
! ## log['LogLevelCritical'] = true
! ## log['Count'] = WebLog[-1]['Count'] + 1
! ## log['Entry'] = "Last entry repeated " + str(log['Count']) + " times"
! ## WebLog.pop()
! ## WebLog.append( log )
! elif (len(WebLog)>0) and (a == WebLog[-1]['Entry']):
! log['TimeCode'] = strftime("[%a, %d %b %Y %H:%M:%S]", localtime())
! log['LogLevel'] = loglevel
! log['LogLevelTrivial'] = false
! log['LogLevelInfo'] = false
! log['LogLevelError'] = false
! log['LogLevelCritical'] = false
! if loglevel == LOG_TRIVIAL:
! log['LogLevelTrivial'] = true
! elif loglevel == LOG_INFO:
! log['LogLevelInfo'] = true
! elif loglevel == LOG_ERROR:
! log['LogLevelError'] = true
! else:
! log['LogLevelCritical'] = true
! log['Count'] = 1
! log['Entry'] = "Last entry repeated once"
! WebLog.append( log )
else:
! log['TimeCode'] = strftime("[%a, %d %b %Y %H:%M:%S]", localtime())
! log['LogLevel'] = loglevel
! log['LogLevelTrivial'] = false
! log['LogLevelInfo'] = false
! log['LogLevelError'] = false
! log['LogLevelCritical'] = false
! if loglevel == LOG_TRIVIAL:
! log['LogLevelTrivial'] = true
! elif loglevel == LOG_INFO:
! log['LogLevelInfo'] = true
! elif loglevel == LOG_ERROR:
! log['LogLevelError'] = true
! else:
! log['LogLevelCritical'] = true
! log['Count'] = 0
! log['Entry'] = a
! WebLog.append( log )
if len(WebLog) > int(HTTPConfig.Get('Display', 'LogCount')):
! del WebLog[0]
BTHandler = LoaderManager(log = WebLogit)
+ BTHandler.Update()
###########################################################################################################
***************
*** 444,447 ****
--- 492,497 ----
pass
tproc.set("Logs", t)
+ tproc.set("logtime", strftime("%a, %d %b %Y %H:%M:%S", localtime()))
+ tproc.set("logs", len(WebLog))
self.wfile.write(tproc.process(templateLog))
|
