diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-10-14 15:33:35 -0300 | 
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-10-14 16:36:09 -0300 | 
| commit | 96ddbd359804d47f81b9572dd56f4a991d7c1e36 (patch) | |
| tree | 772001e7d4f920be0b803135be1b1df88baa8742 | |
| parent | 228f0c41f088eb15fd3125894adaad4868c74ddd (diff) | |
Disable stdout redirection on windows for now since it breaks the bundle
| -rw-r--r-- | src/leap/bitmask/app.py | 16 | 
1 files changed, 10 insertions, 6 deletions
| diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py index 5982fe91..75bf7123 100644 --- a/src/leap/bitmask/app.py +++ b/src/leap/bitmask/app.py @@ -54,6 +54,7 @@ from leap.bitmask.util import leap_argparse  from leap.bitmask.util import log_silencer  from leap.bitmask.util.leap_log_handler import LeapLogHandler  from leap.bitmask.util.streamtologger import StreamToLogger +from leap.bitmask.platform_init import IS_WIN  from leap.common.events import server as event_server  import codecs @@ -140,12 +141,15 @@ def replace_stdout_stderr_with_logging(logger):          - the twisted log output      with a custom one that writes to the logger.      """ -    sys.stdout = StreamToLogger(logger, logging.DEBUG) -    sys.stderr = StreamToLogger(logger, logging.ERROR) - -    # Replace twisted's logger to use our custom output. -    from twisted.python import log -    log.startLogging(sys.stdout) +    # Disabling this on windows since it breaks ALL THE THINGS +    # The issue for this is #4149 +    if not IS_WIN: +        sys.stdout = StreamToLogger(logger, logging.DEBUG) +        sys.stderr = StreamToLogger(logger, logging.ERROR) + +        # Replace twisted's logger to use our custom output. +        from twisted.python import log +        log.startLogging(sys.stdout)  def main(): | 
