summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug_fail_gracefully_events2
-rw-r--r--src/leap/app.py6
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug_fail_gracefully_events b/changes/bug_fail_gracefully_events
new file mode 100644
index 00000000..dbd6f594
--- /dev/null
+++ b/changes/bug_fail_gracefully_events
@@ -0,0 +1,2 @@
+ o Fail gracefully when the events port 8090 is in use by something
+ else. Fixes #3276. \ No newline at end of file
diff --git a/src/leap/app.py b/src/leap/app.py
index f45e46c4..6ba27813 100644
--- a/src/leap/app.py
+++ b/src/leap/app.py
@@ -131,7 +131,11 @@ def main():
"""
Starts the main event loop and launches the main window.
"""
- event_server.ensure_server(event_server.SERVER_PORT)
+ try:
+ event_server.ensure_server(event_server.SERVER_PORT)
+ except Exception as e:
+ # We don't even have logger configured in here
+ print "Could not ensure server: %r" % (e,)
_, opts = leap_argparse.init_leapc_args()
standalone = opts.standalone