diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-08-01 16:12:34 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-08-01 16:12:34 -0300 |
| commit | 421d5a8c264731114a5ecf725925d31879f27627 (patch) | |
| tree | 2020d135a4218e1aa933f5160cd092ef0fd2030b | |
| parent | 1b9f4c824406f26e135a0d96cad04064b8864615 (diff) | |
| parent | 9f3e9eee381fe68b3e8c28fe4a0dec45e4e80488 (diff) | |
Merge remote-tracking branch 'chiiph/bug/fail_gracefully_events' into develop
| -rw-r--r-- | changes/bug_fail_gracefully_events | 2 | ||||
| -rw-r--r-- | src/leap/app.py | 6 |
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 |