linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interface/tcp: default to no extra error-info

Browse Source 
less scrolling during debuging

Change-Id: Id59ef8be5aff518a45c0825cadcb98c89f7a7f21
Reviewed-on: https://forge.frm2.tum.de/review/20257
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber 2019-03-28 13:29:24 +01:00
parent 94959f2e9b
commit 55fe5ccd80
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
secop/protocol/interface/tcp.py
View File

@ -70,6 +70,9 @@ class TCPRequestHandler(socketserver.BaseRequestHandler):
# notify dispatcher of us # notify dispatcher of us
serverobj.dispatcher.add_connection(self) serverobj.dispatcher.add_connection(self)
# copy relevant settings from Interface
detailed_errors = serverobj.detailed_errors
mysocket.settimeout(.3) mysocket.settimeout(.3)
# mysocket.setblocking(False) # mysocket.setblocking(False)
# start serving # start serving
@ -139,6 +142,9 @@ class TCPRequestHandler(socketserver.BaseRequestHandler):
if not result: if not result:
self.log.error('empty result upon msg %s' % repr(msg)) self.log.error('empty result upon msg %s' % repr(msg))
if result[0].startswith(ERRORPREFIX) and not detailed_errors:
# strip extra information
result[2][2].clear()
self.queue_async_reply(result) self.queue_async_reply(result)
def queue_async_reply(self, data): def queue_async_reply(self, data):
@ -167,11 +173,12 @@ class TCPServer(socketserver.ThreadingTCPServer):
allow_reuse_address = True allow_reuse_address = True
def __init__(self, name, logger, options, srv): def __init__(self, name, logger, options, srv):
self.dispatcher =srv.dispatcher self.dispatcher = srv.dispatcher
self.name = name self.name = name
self.log = logger self.log = logger
bindto = options.pop('bindto', 'localhost') bindto = options.pop('bindto', 'localhost')
portnum = int(options.pop('bindport', DEF_PORT)) portnum = int(options.pop('bindport', DEF_PORT))
self.detailed_errors = options.pop('detailed_errors', False)
if ':' in bindto: if ':' in bindto:
bindto, _port = bindto.rsplit(':') bindto, _port = bindto.rsplit(':')
portnum = int(_port) portnum = int(_port)