Dev

runserver/__main__.py

@@ -3,11 +3,9 @@ def tesserver():
     app.config['ENABLELAUNCH'] = True
     from flask_cors import CORS, cross_origin
     CORS(app, supports_credentials=True, origin="*")
-    print("try to run tesserver")
     app.run(host='localhost',debug=False,port=8080)
-    print('app is running')
 
-def tws():
+def tws(stop=None):
     from twsproxy import server
     import sys
     import os
@@ -19,21 +17,29 @@ def tws():
             port = int(sys.argv[1])
         except:
             port = 8090
-    server = server.TWSServer(port,5)
-    logger.debug("initialised server object")
+    server = server.TWSServer(port,5,stop)
     server.run()
 
+def stopThreads(signum,frame,event,old_handler):
+    import logging
+    logger = logging.getLogger()
+    event.set()
+    if callable(old_handler):
+        old_handler(signum,frame)
+    return
 
 def main():
     import logging
+    import signal
     logging.basicConfig(filename="tes.log",format="%(asctime)s %(levelname)s:%(process)s: %(message)s")
     logger=logging.getLogger()
     logger.setLevel(logging.DEBUG)
+    old_handler = signal.getsignal(signal.SIGINT)
+    signal.signal(signal.SIGINT, lambda x,y: stopThreads(x,y,stop,old_handler))
     import threading
-    print("create thread")
-    twsthread = threading.Thread(target=tws)
+    stop=threading.Event()
+    twsthread = threading.Thread(target=tws,args=[stop])
     twsthread.start()
-    print("thread started")
     tesserver()
     twsthread.join()