diff options
| -rw-r--r-- | service/pixelated/config/__init__.py | 4 | ||||
| -rw-r--r-- | service/pixelated/config/debug.py | 40 | ||||
| -rw-r--r-- | service/pixelated/config/logging_setup.py | 80 |
3 files changed, 82 insertions, 42 deletions
diff --git a/service/pixelated/config/__init__.py b/service/pixelated/config/__init__.py index f9c43153..2072278d 100644 --- a/service/pixelated/config/__init__.py +++ b/service/pixelated/config/__init__.py @@ -25,7 +25,7 @@ from pixelated.config.dispatcher import config_dispatcher from pixelated.config.events_server import init_events_server from pixelated.config.loading_page import loading from pixelated.config.register import register -from pixelated.config.debug import init_debugger +from pixelated.config.logging_setup import init_logging from pixelated.config.leap_cert import init_leap_cert from pixelated.config.soledad import init_soledad_and_user_key from twisted.internet import reactor @@ -42,7 +42,7 @@ def initialize(): args = parse_args() app = App() - init_debugger(args) + init_logging(args) init_leap_cert(args) if args.register: diff --git a/service/pixelated/config/debug.py b/service/pixelated/config/debug.py deleted file mode 100644 index d91d3a34..00000000 --- a/service/pixelated/config/debug.py +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2014 ThoughtWorks, Inc. -# -# Pixelated is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Pixelated is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Pixelated. If not, see <http://www.gnu.org/licenses/>. - -import logging -import sys -import os -from twisted.python import log - - -def init_debugger(args): - debug_enabled = args.debug or os.environ.get('DEBUG', False) - 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/pixelated/config/logging_setup.py b/service/pixelated/config/logging_setup.py new file mode 100644 index 00000000..f42f91c9 --- /dev/null +++ b/service/pixelated/config/logging_setup.py @@ -0,0 +1,80 @@ +# +# Copyright (c) 2014 ThoughtWorks, Inc. +# +# Pixelated is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Pixelated is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Pixelated. If not, see <http://www.gnu.org/licenses/>. + +import logging +import socket +import sys +import os +from twisted.python import log +from twisted.python import util + + +LOG_FILE = '/tmp/pixelated.log' + + +def init_logging(args): + pixelated_log_format = '[%(asctime)s] ' + socket.gethostname() + ' %(name)-12s %(levelname)-8s %(message)s' + pixelated_log = logging.FileHandler(LOG_FILE) + pixelated_log.setLevel(logging.DEBUG) + pixelated_log.setFormatter(logging.Formatter(pixelated_log_format)) + + logging.getLogger('').addHandler(pixelated_log) + init_twisted_logging() + debug_enabled = args.debug or os.environ.get('DEBUG', False) + + if debug_enabled: + init_debugger() + + +def init_debugger(): + logging.basicConfig(level=logging.DEBUG, + format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s', + datefmt='%m-%d %H:%M:%S', + filename='/tmp/leap.log', + filemode='w') # define a Handler which writes INFO messages or higher to the sys.stderr + + formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s') + console = logging.StreamHandler() + console.setLevel(logging.DEBUG) + console.setFormatter(formatter) + logging.getLogger('').addHandler(console) + + +def init_twisted_logging(): + log.startLogging(sys.stdout) + file_observer = PixelatedLogObserver(file(LOG_FILE, 'a')) + log.addObserver(file_observer.emit) + + +class PixelatedLogObserver(log.FileLogObserver): + + """ FileLogObserver with a customized format """ + def emit(self, event): + text = log.textFromEventDict(event) + + if text is None: + return + + self.timeFormat = '[%Y-%m-%d %H:%M:%S]' + time_str = self.formatTime(event['time']) + + fmt_dict = {'text': text.replace('\n', '\n\t')} + msg_str = log._safeFormat('%(text)s\n', fmt_dict) + + logging.debug(str(event)) + + util.untilConcludes(self.write, time_str + ' ' + socket.gethostname() + ' ' + msg_str) + util.untilConcludes(self.flush) |