crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show main exception only with --verbose

This commit is contained in:
Lukas Zapletal 2014-04-28 09:48:17 +02:00
parent 6c526fd645
commit b42b3dbce5
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
websockify/websocketproxy.py
View File

@ -402,21 +402,27 @@ def websockify_init():
try: opts.target_port = int(opts.target_port) try: opts.target_port = int(opts.target_port)
except: parser.error("Error parsing target port") except: parser.error("Error parsing target port")
# Transform to absolute path as daemon may chdir try:
if opts.target_cfg: # Transform to absolute path as daemon may chdir
opts.target_cfg = os.path.abspath(opts.target_cfg) if opts.target_cfg:
opts.target_cfg = os.path.abspath(opts.target_cfg)
# Create and start the WebSockets proxy # Create and start the WebSockets proxy
libserver = opts.libserver libserver = opts.libserver
del opts.libserver del opts.libserver
if libserver: if libserver:
# Use standard Python SocketServer framework # Use standard Python SocketServer framework
server = LibProxyServer(**opts.__dict__) server = LibProxyServer(**opts.__dict__)
server.serve_forever() server.serve_forever()
else: else:
# Use internal service framework # Use internal service framework
server = WebSocketProxy(**opts.__dict__) server = WebSocketProxy(**opts.__dict__)
server.start_server() server.start_server()
except:
if opts.verbose:
raise
else:
print >> sys.stderr, 'Unexpected error:', sys.exc_info()[1]
class LibProxyServer(ForkingMixIn, HTTPServer): class LibProxyServer(ForkingMixIn, HTTPServer):