summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/backend_app.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/bitmask/backend_app.py')
-rw-r--r--src/leap/bitmask/backend_app.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/leap/bitmask/backend_app.py b/src/leap/bitmask/backend_app.py
index af71ba12..891575be 100644
--- a/src/leap/bitmask/backend_app.py
+++ b/src/leap/bitmask/backend_app.py
@@ -17,7 +17,6 @@
"""
Start point for the Backend.
"""
-import logging
import multiprocessing
import signal
@@ -26,11 +25,8 @@ from leap.common.events import server as event_server
from leap.bitmask.backend.leapbackend import LeapBackend
from leap.bitmask.backend.utils import generate_zmq_certificates
from leap.bitmask.config import flags
-from leap.bitmask.logs.utils import create_logger
from leap.bitmask.util import dict_to_flags
-logger = logging.getLogger(__name__)
-
def signal_handler(signum, frame):
"""
@@ -46,7 +42,7 @@ def signal_handler(signum, frame):
# In the future we may need to do the stop in here when the frontend and
# the backend are run separately (without multiprocessing)
pname = multiprocessing.current_process().name
- logger.debug("{0}: SIGNAL #{1} catched.".format(pname, signum))
+ print "{0}: SIGNAL #{1} catched.".format(pname, signum)
def run_backend(bypass_checks=False, flags_dict=None, frontend_pid=None):
@@ -58,6 +54,12 @@ def run_backend(bypass_checks=False, flags_dict=None, frontend_pid=None):
:param flags_dict: a dict containing the flag values set on app start.
:type flags_dict: dict
"""
+ # NOTE: this needs to be used here, within the call since this function is
+ # executed in a different process and it seems that the process/thread
+ # identification isn't working 100%
+ from leap.bitmask.logs.utils import get_logger
+ logger = get_logger()
+
# The backend is the one who always creates the certificates. Either if it
# is run separately or in a process in the same app as the frontend.
if flags.ZMQ_HAS_CURVE:
@@ -84,5 +86,4 @@ def run_backend(bypass_checks=False, flags_dict=None, frontend_pid=None):
if __name__ == '__main__':
- logger = create_logger(debug=True)
run_backend()