diff --git a/runserver/__main__.py b/runserver/__main__.py index ac16d16a47870392b5af7212387f04fa91cfd1ad..8d5d36b28d4fc8b940574c0b30e1b25eb9668296 100644 --- a/runserver/__main__.py +++ b/runserver/__main__.py @@ -31,7 +31,8 @@ def stopThreads(signum,frame,event,old_handler): def main(): import logging import signal - logging.basicConfig(filename="tes.log",format="%(asctime)s %(levelname)s:%(process)s: %(message)s") + FORMAT = "[%(asctime)s %(levelname)s:%(process)s %(filename)s:%(lineno)s - %(funcName)20s() ] %(message)s" + logging.basicConfig(filename="tes.log",format=FORMAT) logger=logging.getLogger() logger.setLevel(logging.DEBUG) old_handler = signal.getsignal(signal.SIGINT) diff --git a/tes/sshwrapper/__init__.py b/tes/sshwrapper/__init__.py index 06acddb9bfd4e78a8d79cbe06ac802fceff33e6d..833416218d21fa1847837f9af58c7e5867970cf8 100644 --- a/tes/sshwrapper/__init__.py +++ b/tes/sshwrapper/__init__.py @@ -150,7 +150,8 @@ class Ssh: #logger.debug("master spawned, attempt communicate") #stdout, stderr = ctrl_p.communicate() #logger.debug('communicate on the control port complete') - sess.pids.append(ctrl_p.pid) + logger.debug("spanwed ssh mux with pid {}".format(ctrl_p.pid)) + #sess.pids.append(ctrl_p.pid) sess.ctrl_processes[ctrlsocket] = ctrl_p try: mode = os.stat(ctrlsocket).st_mode