Merge branch 'nct/may21'

[tools/sat.git] / src / debug.py

diff --git a/src/debug.py b/src/debug.py
index 50e24d883c26594c6a0f71d56cfd49d4a1d103d6..30d6ea7d852bd897191df9ad2001e03573b7af69 100755 (executable)
--- a/src/debug.py
+++ b/src/debug.py
@@ -55,6 +55,8 @@ import os
 import sys
 import traceback
 import pprint as PP
+import inspect
+import src
 
 # Compatibility python 2/3 for unicode
 try:
@@ -70,14 +72,13 @@ except ImportError:
 
 _debug = [False] #support push/pop for temporary activate debug outputs
 
-_user = os.environ['USER']
 # wambeke is christian at home
-_developers = ["christian", "wambeke"] # crouzet, kloss ...
+_developers = ["christian", "wambeke"]
 
 
 def isDeveloper():
     """if you are a developer, sometimes you want verbose traces etc."""
-    res = _user in _developers
+    res = src.architecture.get_user()  in _developers
     return res
 
 def indent(text, amount=2, ch=' '):
@@ -95,9 +96,13 @@ def isTypeConfig(var):
     # print "NOT isTypeConfig %s" % typ
     return False
     
-def write(title, var="", force=None, fmt="\n#### DEBUG: %s:\n%s\n"):
+def write(title, var="", force=None, fmt="  %s:\n%s\n####\n"):
     """write sys.stderr a message if _debug[-1]==True or optionaly force=True"""
     if _debug[-1] or force:
+      callerframerecord = inspect.stack()[1] # get info of the caller
+      frame = callerframerecord[0]
+      info = inspect.getframeinfo(frame)
+      sys.stderr.write("\n#### DEBUG - %s:%s (%s) ####\n" % (info.filename, info.lineno, info.function))
       tvar = type(var)
       typ = str(tvar)
       if isTypeConfig(var):
@@ -119,7 +124,11 @@ def tofix(title, var="", force=None):
     use this only if no logger accessible for classic logger.warning(message)
     """
     if _debug[-1] or isDeveloper():
-        fmt = "\n#### TOFIX: %s:\n%s\n"
+        callerframerecord = inspect.stack()[1] # get info of the caller
+        frame = callerframerecord[0]
+        info = inspect.getframeinfo(frame)
+        fmt = "#### TOFIX - " + str(info.filename) + ":" + str(info.lineno) +\
+              " (" + str(info.function) + ") ####\n   %s:\n%s\n"
         write(title, var, force, fmt)
 
 def push_debug(aBool):