Skip to content
Snippets Groups Projects
Commit eec1775b authored by Chris Hines's avatar Chris Hines
Browse files

Merge branch 'dev' into 'test'

Dev

See merge request !88
parents b9075703 e3f9c5f8
No related branches found
No related tags found
2 merge requests!90I think there is a problem with multiple threads creating multiple sessions...,!88Dev
Pipeline #56736 passed
......@@ -5,6 +5,9 @@ location / {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_read_timeout 300;
proxy_connect_timeout 300;
proxy_send_timeout 300;
add_header 'Access-Control-Allow-Origin' $http_origin;
add_header 'Access-Control-Allow-Credentials' 'true';
client_max_body_size 50M;
......
......@@ -153,7 +153,7 @@ class TWSProxy(threading.Thread):
name = threading.current_thread().name
while not closed:
r,w,e = select.select([src],[],[],TWSProxy.TIMEOUT)
if len(r) > 0 and (not (type(r) == list)):
if len(r) > 0:
buff = None
msglength = -1
try:
......@@ -171,7 +171,6 @@ class TWSProxy(threading.Thread):
if msglength > 0:
TWSProxy.reliablesend(dest,buff,msglength)
if msglength == 0:
logger.debug('socket shutdown, fh ready to read but 0 bytes returned')
#dest.send(buff)
dest.shutdown(shuttype)
initshutdown.set()
......@@ -191,7 +190,7 @@ def mainserver(port=None):
logger = logging.getLogger()
handler = TimedRotatingFileHandler(filename="/var/log/strudel2/tws.log",when='h',interval=24,backupCount=7)
formatter = logging.Formatter("%(asctime)s %(levelname)s:%(process)s: %(message)s")
handler.setFormattter(formatter)
handler.setFormatter(formatter)
logger.addHandler(handler)
except Exception as e:
import traceback
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment