Update of /cvsroot/btplusplus/BT++/src/WebServer
In directory sc8-pr-cvs1:/tmp/cvs-serv9576/src/WebServer
Modified Files:
BTWebServer.py HTTPConfigFile.py
Log Message:
WebLog colored by loglevel & Startup dir creation fixed
Index: BTWebServer.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/WebServer/BTWebServer.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BTWebServer.py 25 Feb 2003 23:43:17 -0000 1.1
--- BTWebServer.py 26 Feb 2003 01:12:05 -0000 1.2
***************
*** 3,7 ****
from HTTPConfigFile import HTTPConfig
from threading import Event
! from os import listdir, path
from TabTrans.LoaderManager import LoaderManager
from urlparse import urlparse
--- 3,7 ----
from HTTPConfigFile import HTTPConfig
from threading import Event
! from os import listdir, path, chdir, mkdir
from TabTrans.LoaderManager import LoaderManager
from urlparse import urlparse
***************
*** 92,99 ****
def WebLogit(a, loglevel = LOG_INFO):
if loglevel >= int(HTTPConfig.Get('Display', 'LogLevel')):
! WebLog.append(strftime("[%a, %d %b %Y %H:%M:%S]_", localtime()) + a)
if len(WebLog) > int(HTTPConfig.Get('Display', 'LogCount')):
WebLog.pop()
BTHandler = LoaderManager(log = WebLogit)
--- 92,114 ----
def WebLogit(a, loglevel = LOG_INFO):
if loglevel >= int(HTTPConfig.Get('Display', 'LogLevel')):
! WebLog.append(strftime("[%a, %d %b %Y %H:%M:%S]_", localtime()) + str(loglevel) + '_' + a)
if len(WebLog) > int(HTTPConfig.Get('Display', 'LogCount')):
WebLog.pop()
+ chdir(
+ path.abspath(
+ path.dirname(sys.argv[0])
+ )
+ )
+
+ try: mkdir(Config.Get('Paths', 'Incoming'))
+ except: pass
+ try: mkdir(Config.Get('Paths', 'Torrent'))
+ except: pass
+ try: mkdir(Config.Get('Paths', 'History'))
+ except: pass
+ try: mkdir(Config.Get('Paths', 'Temp'))
+ except: pass
+
BTHandler = LoaderManager(log = WebLogit)
***************
*** 396,400 ****
ret = "<html>\n<head>\n<title>WebTorrent++ Log</title>\n"
ret = ret + "</head>\n<body bgcolor=#%s>\n" % HTTPConfig.Get('WebColors','LogBackground')
! ret = ret + "<h1>WebTorrent++ Log</h1>\n<table bgcolor=#%s border=1 cellpadding=4>\n" % HTTPConfig.Get('WebColors','LogTable')
t = WebLog[:]
try:
--- 411,415 ----
ret = "<html>\n<head>\n<title>WebTorrent++ Log</title>\n"
ret = ret + "</head>\n<body bgcolor=#%s>\n" % HTTPConfig.Get('WebColors','LogBackground')
! ret = ret + "<h1>WebTorrent++ Log</h1>\n<table border=1 cellpadding=4>\n"
t = WebLog[:]
try:
***************
*** 403,408 ****
pass
for line in t:
! sp = str(line).split('_',1)
! ret = ret + "<tr><td nowrap>%s</td><td width=100%%>%s</td></tr>\n" % (sp[0], sp[1])
ret = ret + "</table>\n</body>\n</html>"
self.wfile.write(ret)
--- 418,423 ----
pass
for line in t:
! sp = str(line).split('_',2)
! ret = ret + "<tr bgcolor=#%s><td nowrap>%s</td><td width=100%%>%s</td></tr>\n" % (HTTPConfig.Get('WebColors','LogTable'+sp[1]), sp[0], sp[2])
ret = ret + "</table>\n</body>\n</html>"
self.wfile.write(ret)
***************
*** 417,429 ****
def __init__(self):
- try: mkdir(Config.Get('Paths', 'Incoming'))
- except: pass
- try: mkdir(Config.Get('Paths', 'Torrent'))
- except: pass
- try: mkdir(Config.Get('Paths', 'History'))
- except: pass
- try: mkdir(Config.Get('Paths', 'Temp'))
- except: pass
-
self.localIP = socket.gethostbyname(socket.gethostname())
--- 432,435 ----
Index: HTTPConfigFile.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/WebServer/HTTPConfigFile.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HTTPConfigFile.py 25 Feb 2003 23:43:17 -0000 1.1
--- HTTPConfigFile.py 26 Feb 2003 01:12:05 -0000 1.2
***************
*** 29,33 ****
'ConfTable': 'CCCCFF',
'LogBackground': 'AA6666',
! 'LogTable': 'FF6666'
}
}
--- 29,36 ----
'ConfTable': 'CCCCFF',
'LogBackground': 'AA6666',
! 'LogTable0': 'FFFF66',
! 'LogTable1': '66DD66',
! 'LogTable2': 'FF6666',
! 'LogTable3': 'FF6666'
}
}
|
