From 46efcad61f6474a8569cd78b1b34e5ff0e3c50a4 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Mon, 4 Mar 2019 12:13:09 +1100
Subject: [PATCH] ooops main routine inside __init__
---
TWS/twsproxy/__init__.py | 4 +++-
TWS/twsproxy/__main__.py | 11 -----------
2 files changed, 3 insertions(+), 12 deletions(-)
delete mode 100644 TWS/twsproxy/__main__.py
diff --git a/TWS/twsproxy/__init__.py b/TWS/twsproxy/__init__.py
index 26181f5..9120a9b 100644
--- a/TWS/twsproxy/__init__.py
+++ b/TWS/twsproxy/__init__.py
@@ -244,10 +244,12 @@ class TWSProxy(threading.Thread):
def main():
from . import server
import logging
+ import sys
logging.basicConfig(filename="/var/log/tws.log",format="%(asctime)s %(levelname)s:%(process)s: %(message)s")
logger = logging.getLogger()
logger.setLevel(logging.DEBUG)
logger.debug("starting TWS proxy")
- server = server.TWSServer()
+ port = int(sys.argv[1])
+ server = server.TWSServer(port,5)
logger.debug("initialised server object")
server.run()
diff --git a/TWS/twsproxy/__main__.py b/TWS/twsproxy/__main__.py
deleted file mode 100644
index c930fd7..0000000
--- a/TWS/twsproxy/__main__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from . import server
-import logging
-logging.basicConfig(filename="/var/log/tws.log",format="%(asctime)s %(levelname)s:%(process)s: %(message)s")
-logger = logging.getLogger()
-logger.setLevel(logging.DEBUG)
-import sys
-port = int(sys.argv[1])
-logger.debug("starting TWS proxy")
-print("starting TWS proxy")
-server = server.TWSServer(port,5)
-server.run()
--
GitLab