Added auto-reconnect.

[pymsnt] / src / debug.py

diff --git a/src/debug.py b/src/debug.py
index 780f27a665ef1f8503e8c76e547d74d48b734753..0f90522e631b8e37bb2c8be0ef7eb076bdbc4ffd 100644 (file)
--- a/src/debug.py
+++ b/src/debug.py
@@ -2,7 +2,78 @@
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
 from twisted.python import log
-import sys
+
+import sys, time
+
+import config
+
+
+def observer(eventDict):
+       try:
+               observer2(eventDict)
+       except Exception, e:
+               printf("CRITICAL: Traceback in debug.observer2 - " + str(e))
+
+
+def observer2(eventDict):
+       edm = eventDict['message']
+       if isinstance(edm, LogEvent):
+               if edm.category == INFO and config._debugLevel < 3:
+                       return
+               if (edm.category == WARN or edm.category == ERROR) and config._debugLevel < 2:
+                       return
+               text = str(edm)
+       elif edm:
+               if config._debugLevel < 3: return
+               text = ' '.join(map(str, edm))
+       else:
+               if eventDict['isError'] and eventDict.has_key('failure'):
+                       if config._debugLevel < 1: return
+                       text = eventDict['failure'].getTraceback()
+               elif eventDict.has_key('format'):
+                       if config._debugLevel < 3: return
+                       text = eventDict['format'] % eventDict
+               else:
+                       return
+       
+       # Now log it!
+       timeStr = time.strftime("[%Y-%m-%d %H:%M:%S]", time.localtime(eventDict['time']))
+       text = text.replace("\n", "\n\t")
+       global debugFile
+       debugFile.write("%s %s\n" % (timeStr, text))
+       debugFile.flush()
+       
+def printf(text):
+       sys.__stdout__.write(text + "\n")
+       sys.__stdout__.flush()
+
+debugFile = None
+def reloadConfig():
+       global debugFile
+       if debugFile:
+               debugFile.close()
+       
+       try:
+               config._debugLevel = int(config.debugLevel.strip())
+       except ValueError:
+               config._debugLevel = 0
+               config.debugLevel = "0"
+
+       if config._debugLevel > 0:
+               if len(config.debugFile) > 0:
+                       try:
+                               debugFile = open(config.debugFile, "a")
+                               log.msg("Reopened log file.")
+                       except IOError:
+                               log.discardLogs() # Give up
+                               debugFile = sys.__stdout__
+                               return
+               else:
+                       debugFile = sys.__stdout__
+
+               log.startLoggingWithObserver(observer)
+       else:
+               log.discardLogs()
 
 class INFO : pass
 class WARN : pass
@@ -12,7 +83,9 @@ class LogEvent:
        def __init__(self, category=INFO, ident="", msg="", log=True):
                self.category, self.ident, self.msg = category, ident, msg
                frame = sys._getframe(1)
-               self.klass = frame.f_locals.get("self", frame.f_code.co_filename)
+               # Get the class name
+               s = str(frame.f_locals.get("self", frame.f_code.co_filename))
+               self.klass = s[s.find(".")+1:s.find(" ")]
                self.method = frame.f_code.co_name
                self.args = frame.f_locals
                if log:
@@ -21,6 +94,9 @@ class LogEvent:
        def __str__(self):
                args = {}
                for key in self.args.keys():
+                       if key == "self":
+                               args["self"] = "instance"
+                               continue
                        val = self.args[key]
                        args[key] = val
                        try:
@@ -35,3 +111,5 @@ class LogEvent:
        def log(self):
                log.msg(self)
 
+
+