From fbedbfe7bac894352e33df8d651445689a376e34 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Tue, 15 Nov 2022 13:17:58 +1100
Subject: [PATCH] more logging
---
twsproxy/__init__.py | 9 ++++++---
twsproxy/server/__init__.py | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/twsproxy/__init__.py b/twsproxy/__init__.py
index 52937e9..fe659ac 100644
--- a/twsproxy/__init__.py
+++ b/twsproxy/__init__.py
@@ -107,7 +107,7 @@ class TWSProxy(threading.Thread):
import re
import requests
logger = logging.getLogger()
- token_format = [ b'Authorization: token (?P<authtok>\w+)[\W|$]',
+ token_formats = [ b'Authorization: token (?P<authtok>\w+)[\W|$]',
b'token=(?P<authtok>\w+)[&|\W|$]',
b'twsproxyauth=(?P<authtok>\w+)[\W|$]']
@@ -184,6 +184,7 @@ def mainserver(port=None):
import logging
import sys
import os
+ to_log=None
try:
from logging.handlers import TimedRotatingFileHandler
logger = logging.getLogger()
@@ -192,12 +193,14 @@ def mainserver(port=None):
handler.setFormattter(formatter)
logger.addHandler(handler)
except Exception as e:
- print(e)
import traceback
- print(traceback.format_exc())
+ to_log = "{}\n".format(e)
+ to_log = to_log + traceback.format_exc()
logging.basicConfig(filename=os.path.expanduser("~/.tws.log"),format="%(asctime)s %(levelname)s:%(process)s: %(message)s")
logger = logging.getLogger()
logger.setLevel(logging.DEBUG)
+ if to_log is not None:
+ logger.debug(to_log)
logger.debug("starting TWS proxy")
if port is None:
try:
diff --git a/twsproxy/server/__init__.py b/twsproxy/server/__init__.py
index 2eba52f..b4631a0 100644
--- a/twsproxy/server/__init__.py
+++ b/twsproxy/server/__init__.py
@@ -34,6 +34,7 @@ class TWSServer:
while not self.stop.is_set():
try:
(clientsocket, address) = serversocket.accept()
+ logger.debug('accepted connection {}'.format(clientsocket))
except socket.timeout:
continue
clientsocket.setblocking(True)
--
GitLab