diff options
| -rw-r--r-- | service/pixelated/config/app_factory.py | 6 | ||||
| -rw-r--r-- | service/pixelated/runserver.py | 30 | ||||
| -rw-r--r-- | service/test/functional/features/environment.py | 3 |
3 files changed, 21 insertions, 18 deletions
diff --git a/service/pixelated/config/app_factory.py b/service/pixelated/config/app_factory.py index c479a913..8b256550 100644 --- a/service/pixelated/config/app_factory.py +++ b/service/pixelated/config/app_factory.py @@ -33,7 +33,9 @@ from leap.common.events import ( register, events_pb2 as proto ) +from twisted.web.iweb import IAccessLogFormatter from twisted.web.server import Site +from zope.interface import provider def init_index_and_remove_dupes(querier, search_engine, mail_service): @@ -130,10 +132,6 @@ def init_app(app): def create_app(app): - from twisted.python import log - import sys - log.startLogging(sys.stdout) - reactor.listenTCP(3333, Site(app.resource()), interface='localhost') reactor.callWhenRunning(lambda: init_app(app)) reactor.run() diff --git a/service/pixelated/runserver.py b/service/pixelated/runserver.py index 832008ad..a2e37ec0 100644 --- a/service/pixelated/runserver.py +++ b/service/pixelated/runserver.py @@ -19,10 +19,13 @@ import sys import logging import json from klein import Klein +from twisted.python.log import ILogObserver klein_app = Klein() import ConfigParser +from twisted.python import log +import sys from leap.common.events import server as events_server from pixelated.config import app_factory import pixelated.config.args as input_args @@ -71,19 +74,20 @@ def fetch_credentials_from_dispatcher(filename): def setup_debugger(enabled): debug_enabled = enabled or os.environ.get('DEBUG', False) - logging.basicConfig(level=logging.DEBUG, - format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s', - datefmt='%m-%d %H:%M', - filename='/tmp/leap.log', - filemode='w') # define a Handler which writes INFO messages or higher to the sys.stderr - console = logging.StreamHandler() - console.setLevel(logging.DEBUG) - # set a format which is simpler for console use - formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s') - # tell the handler to use this format - console.setFormatter(formatter) - # add the handler to the root logger - logging.getLogger('').addHandler(console) + log.startLogging(sys.stdout) + + if debug_enabled: + logging.basicConfig(level=logging.DEBUG, + format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s', + datefmt='%m-%d %H:%M', + filename='/tmp/leap.log', + filemode='w') # define a Handler which writes INFO messages or higher to the sys.stderr + + console = logging.StreamHandler() + console.setLevel(logging.DEBUG) + formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s') + console.setFormatter(formatter) + logging.getLogger('').addHandler(console) return debug_enabled diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py index 19e2a6f0..cb9e0876 100644 --- a/service/test/functional/features/environment.py +++ b/service/test/functional/features/environment.py @@ -33,7 +33,8 @@ def before_all(context): pixelated.controllers.features_controller.FeaturesController.DISABLED_FEATURES.append('autoRefresh') logging.disable('INFO') - worker = lambda app, port: pixelated.runserver.app.run(host='localhost', port=4567) + worker = lambda app, port: pixelated.runserver.app.run(host='localhost', port=4567, + logFile=open('/tmp/behave-tests.log', 'w')) context._process = multiprocessing.Process(target=worker, args=(context.app, 4567)) context._process.start() |