summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/app.py
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2015-06-05 13:36:51 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2015-06-22 15:52:37 -0300
commit584a6d93ad1fe1ba46929108f002a16a8b70e95d (patch)
tree966ad07fdbe9cff29911dacbcdc750f75a92bd87 /src/leap/bitmask/app.py
parent8752f7f03a04ca7fa1169885adc9dbfce8bebbd4 (diff)
[feat] add a zmq based logger, change log window
- Add a new handler for a zmq/thread-safe log send between components. - Update the log window to use this new handler. - Remove old custom handler We have implemented a new handler that uses logbook, so this one is no longer needed. - Adapt log silencer to new handler - Use log file always as default - Related: #6733
Diffstat (limited to 'src/leap/bitmask/app.py')
-rw-r--r--src/leap/bitmask/app.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py
index 731c168c..adab8652 100644
--- a/src/leap/bitmask/app.py
+++ b/src/leap/bitmask/app.py
@@ -124,7 +124,6 @@ def start_app():
options = {
'start_hidden': opts.start_hidden,
'debug': opts.debug,
- 'log_file': opts.log_file,
}
flags.STANDALONE = opts.standalone
@@ -137,7 +136,13 @@ def start_app():
flags.CA_CERT_FILE = opts.ca_cert_file
- replace_stdout = True
+ flags.DEBUG = opts.debug
+
+ logger = get_logger()
+
+ # NOTE: since we are not using this right now, the code that replaces the
+ # stdout needs to be reviewed when we enable this again
+ # replace_stdout = True
# XXX mail repair commands disabled for now
# if opts.repair or opts.import_maildir:
@@ -145,8 +150,6 @@ def start_app():
# this could be more generic with a Command class.
# replace_stdout = False
- logger = create_logger(opts.debug, opts.log_file, replace_stdout)
-
# ok, we got logging in place, we can satisfy mail plumbing requests
# and show logs there. it normally will exit there if we got that path.
# XXX mail repair commands disabled for now