changeset 440:88461e9c3e47

browser_side (log): move logging configuration in a "logging" module + use custom backend with console.debug/info/etc output.
author Goffi <goffi@goffi.org>
date Thu, 08 May 2014 19:13:56 +0200
parents d52f529a6d42
children 63017904c4d4
files browser_side/logging.py libervia.py
diffstat 2 files changed, 54 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser_side/logging.py	Thu May 08 19:13:56 2014 +0200
@@ -0,0 +1,50 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Libervia: a Salut à Toi frontend
+# Copyright (C) 2011, 2012, 2013, 2014 Jérôme Poisson <goffi@goffi.org>
+
+# This program 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.
+
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+"""This module configure logs for Libervia browser side"""
+
+from __pyjamas__ import console
+from constants import Const as C
+from sat.core import log
+
+
+class LiberviaLogger(log.Logger):
+
+    def out(self, message, level=None):
+        if level == C.LOG_LVL_DEBUG:
+            console.debug(message)
+        elif level == C.LOG_LVL_INFO:
+            console.info(message)
+        elif level == C.LOG_LVL_WARNING:
+            console.warn(message)
+        else:
+            console.error(message)
+
+
+def configure():
+    fmt = '[%(name)s] %(message)s'
+    log.configure(C.LOG_BACKEND_CUSTOM,
+                  logger_class = LiberviaLogger,
+                  level = C.LOG_LVL_DEBUG,
+                  fmt = fmt,
+                  output = None,
+                  logger = None,
+                  colors = False,
+                  force_colors = False)
+    # FIXME: workaround for Pyjamas, need to be removed when Pyjamas is fixed
+    LiberviaLogger.fmt = fmt
--- a/libervia.py	Thu May 08 17:21:34 2014 +0200
+++ b/libervia.py	Thu May 08 19:13:56 2014 +0200
@@ -19,16 +19,10 @@
 
 import pyjd  # this is dummy in pyjs
 
-from constants import Const as C
 ### logging configuration ###
-from sat.core.log import configure, getLogger
-configure(C.LOG_BACKEND_BASIC,
-          level = C.LOG_LVL_DEBUG,
-          fmt = '[%(name)s / %(levelname)s] %(message)s',
-          output = None,
-          logger = None,
-          colors = False,
-          force_colors = False)
+from browser_side import logging
+logging.configure()
+from sat.core.log import getLogger
 log = getLogger(__name__)
 ###
 
@@ -52,6 +46,7 @@
 from sat_frontends.tools.misc import InputHistory
 from sat_frontends.tools.strings import getURLParams
 from sat.core.i18n import _
+from constants import Const as C
 
 
 MAX_MBLOG_CACHE = 500  # Max microblog entries kept in memories