Commit f1b5c53b authored by Benjamin "Ziirish" SANS's avatar Benjamin "Ziirish" SANS

Merge branch 'fix-ws' into 'master'

fix: websocket was not working anymore since 53b404a9

See merge request ziirish/burp-ui!96
parents 5d9600d0 338c791c
Pipeline #1518 passed with stage
in 4 minutes and 36 seconds
......@@ -132,7 +132,9 @@ def create_app(conf=None, verbose=0, logfile=None, **kwargs):
'debug: {}\n'.format(debug) +
'unittest: {}\n'.format(unittest) +
'cli: {}\n'.format(cli) +
'reverse_proxy: {}'.format(reverse_proxy)
'reverse_proxy: {}\n'.format(reverse_proxy) +
'celery_worker: {}\n'.format(celery_worker) +
'websocket_server: {}'.format(websocket_server)
if not unittest: # pragma: no cover
......@@ -169,7 +171,7 @@ def create_app(conf=None, verbose=0, logfile=None, **kwargs):'Using configuration: {}'.format(app.config['CFG']))
app.setup(app.config['CFG'], unittest, cli)
if cli:
if cli and not websocket_server:
return app
if debug:
......@@ -1469,7 +1469,7 @@ class Config(File):
removed = []
orig = self.files
orig = self.files.copy()
for path, conf in orig.items():
if conf.parent and (( not in self._includes and not in self._templates) or in removed):
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment