Merge remote-tracking branch 'ivan-github/bug/3914_unhandled-error-on-version-flag' into develop

1 files changed, 9 insertions, 9 deletions

diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py
index 02b1693d..d5132731 100644
--- a/src/leap/bitmask/app.py
+++ b/src/leap/bitmask/app.py
@@ -152,12 +152,6 @@ def main():
     """
     Starts the main event loop and launches the main window.
     """
-    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()
 
     if opts.version:
@@ -170,6 +164,12 @@ def main():
     logfile = opts.log_file
     openvpn_verb = opts.openvpn_verb
 
+    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,)
+
     #############################################################
     # Given how paths and bundling works, we need to delay the imports
     # of certain parts that depend on this path settings.
@@ -179,6 +179,9 @@ def main():
     flags.STANDALONE = standalone
     BaseConfig.standalone = standalone
 
+    logger = add_logger_handlers(debug, logfile)
+    replace_stdout_stderr_with_logging(logger)
+
     # And then we import all the other stuff
     from leap.bitmask.gui import locale_rc
     from leap.bitmask.gui import twisted_main
@@ -190,9 +193,6 @@ def main():
     # pylint: avoid unused import
     assert(locale_rc)
 
-    logger = add_logger_handlers(debug, logfile)
-    replace_stdout_stderr_with_logging(logger)
-
     if not we_are_the_one_and_only():
         # Bitmask is already running
         logger.warning("Tried to launch more than one instance "