summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/app.py
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2015-06-12 14:34:18 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2015-06-22 15:52:37 -0300
commit32658ae3108bc67a102cf6e0153d468b3a8ae1b0 (patch)
treea0c70c2e19c9484210c132af35a80342d937290f /src/leap/bitmask/app.py
parent584a6d93ad1fe1ba46929108f002a16a8b70e95d (diff)
[feat] replace old log handler with new one
Replace logging.getLogger with custom get_logger. Remove some unneeded dependencies and reorder other.
Diffstat (limited to 'src/leap/bitmask/app.py')
-rw-r--r--src/leap/bitmask/app.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py
index adab8652..543fa03a 100644
--- a/src/leap/bitmask/app.py
+++ b/src/leap/bitmask/app.py
@@ -39,19 +39,18 @@
# M:::::::::::~NMMM7???7MMMM:::::::::::::::::::::::NMMMI??I7MMMM:::::::::::::M
# M::::::::::::::7MMMMMMM+:::::::::::::::::::::::::::?MMMMMMMZ:::::::::::::::M
# (thanks to: http://www.glassgiant.com/ascii/)
+
import atexit
import multiprocessing
import os
import sys
-
-from leap.bitmask.backend.backend_proxy import BackendProxy
-
from leap.bitmask import __version__ as VERSION
+from leap.bitmask.backend.backend_proxy import BackendProxy
+from leap.bitmask.backend_app import run_backend
from leap.bitmask.config import flags
from leap.bitmask.frontend_app import run_frontend
-from leap.bitmask.backend_app import run_backend
-from leap.bitmask.logs.utils import create_logger
+from leap.bitmask.logs.utils import get_logger
from leap.bitmask.platform_init.locks import we_are_the_one_and_only
from leap.bitmask.services.mail import plumber
from leap.bitmask.util import leap_argparse, flags_to_dict
@@ -171,8 +170,8 @@ def start_app():
check_requirements()
logger.info('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
- logger.info('Bitmask version %s', VERSION)
- logger.info('leap.mail version %s', MAIL_VERSION)
+ logger.info('Bitmask version %s' % VERSION)
+ logger.info('leap.mail version %s' % MAIL_VERSION)
logger.info('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
logger.info('Starting app')