Am 16.02.2016 um 14:08 schrieb Wolfgang Mauerer:
Am 16/02/2016 um 13:39 schrieb Andreas Ringlstetter:
From: Benjamin Hiefner <benjamin.hiefner@xxxxxxxxxxxxxxxxxxxx>
PEP8 and renaming of format to format_string to avoid collision
not sure which collision you are referring to -- can you
please document the rationale for the change in the description?
Signed-off-by: Benjamin Hiefner <benjamin.hiefner@xxxxxxxxxxxxxxxxxxxx>
---
codeface/logger.py | 129
+++++++++++++++++++++++++++++++++--------------------
1 file changed, 81 insertions(+), 48 deletions(-)
diff --git a/codeface/logger.py b/codeface/logger.py
index 33178cd..6abb5b4 100644
--- a/codeface/logger.py
+++ b/codeface/logger.py
@@ -1,19 +1,19 @@
-## This file is part of Codeface. Codeface is free software: you can
-## redistribute it and/or modify it under the terms of the GNU General
Public
-## License as published by the Free Software Foundation, version 2.
-##
-## 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 General Public License for more
-## details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-##
-## Copyright 2013 by Siemens AG, Wolfgang Mauerer
<wolfgang.mauerer@xxxxxxxxxxx>
-## All Rights Reserved.
-'''
+# This file is part of Codeface. Codeface is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
+#
+# 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 General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Copyright 2013 by Siemens AG, Wolfgang Mauerer
<wolfgang.mauerer@xxxxxxxxxxx>
+# All Rights Reserved.
+"""
This module provides a root logger for the codeface package.
in the other changes, you used
"""Text starts here
Here you use
"""
Test starts here
If you use both conventions anyway, there's little point in changing one
to another.
On import, this module initializes the logger 'codeface' with a console
logger
@@ -23,42 +23,56 @@ are couloured according to their log level.
Note: If there is demand for more elaborate logging (multiple logfiles,
network logging, etc.) the logging.config module should probably be used
instead of the current handcoded configuration.
-'''
+"""
import logging
import os
-import multiprocessing
from copy import copy
DEVINFO_LEVEL = 15
logging.DEVINFO = DEVINFO_LEVEL
logging.addLevelName(DEVINFO_LEVEL, "DEVINFO")
+
def set_log_level(level_string):
- '''
+ """
Change the log level of the console logger to the level given in
*level_string*, which can be debug, info, warning or error.
- '''
- console_handler.setLevel(_loglevel_from_string(level_string)-1)
+
+ Args:
+ level_string:
+ """
+ console_handler.setLevel(_loglevel_from_string(level_string) - 1)
+
def start_logfile(filename, level_string):
- '''
+ """
Start logging to the file specified by *filename* using the log level
specified in *level_string*.
- '''
+
+ Args:
+ filename:
+ level_string:
+ """
logfile_handler = _get_log_handler(file(filename, 'w'))
logfile_handler.setLevel(_loglevel_from_string(level_string))
- log.devinfo("Opened logfile '{}' with log level '{}'"
- "".format(filename, level_string))
+ log.devinfo("Opened logfile '%s' with log level '%s'",
+ filename, level_string)
log.addHandler(logfile_handler)
logfile_handlers[filename] = logfile_handler
+
def stop_logfile(filename):
- '''Stop logging to the log file *filename*'''
+ """Stop logging to the log file *filename*
+
+ Args:
+ filename:
+ """
handler = logfile_handlers[filename]
handler.flush()
log.removeHandler(handler)
handler.close()
- log.devinfo("Stopped logging into logfile '{}'".format(filename))
+ log.devinfo("Stopped logging into logfile '%s'", filename)
+
# Internal constants and definitions follow
@@ -74,32 +88,36 @@ RED, GREEN, YELLOW, BLUE, WHITE = 1, 2, 3, 4, 7
# Colours which are used for the respective log levels.
COLORS = {
- 'DEBUG' : BLUE,
- 'DEVINFO' : WHITE,
- 'INFO' : GREEN,
- 'WARNING' : YELLOW,
- 'ERROR' : RED,
- 'CRITICAL' : RED,
+ 'DEBUG': BLUE,
+ 'DEVINFO': WHITE,
+ 'INFO': GREEN,
+ 'WARNING': YELLOW,
+ 'ERROR': RED,
+ 'CRITICAL': RED,
}
logfile_handlers = {}
+
def _insert_seqs(message):
- '''
+ """
Insert the ANSI reset/bold sequences into a *message* that has been
formatted with the $RESET and $BOLD pseudo-variables.
- '''
+ """
return message.replace("$RESET", RESET_SEQ).replace("$BOLD", BOLD_SEQ)
+
def _remove_seqs(message):
- '''Remove the $RESET and $BOLD pseudo-variables from a message.'''
+ """Remove the $RESET and $BOLD pseudo-variables from a message."""
return message.replace("$RESET", "").replace("$BOLD", "")
+
class _ColoredFormatter(logging.Formatter):
- '''
+ """
Utility class that adds terminal colour codes to log messages
to improve the visibility of important messages.
- '''
+ """
+
def format(self, record):
levelname = record.levelname
if levelname in COLORS:
@@ -110,39 +128,54 @@ class _ColoredFormatter(logging.Formatter):
record.levelname = color_seq + levelname + RESET_SEQ
return logging.Formatter.format(self, record)
+
def _loglevel_from_string(level_string):
- '''Converts a log level string from e.g. the command line into a
number'''
+ """Converts a log level string from e.g. the command line into a
number"""
return getattr(logging, level_string.upper())
+
def _get_log_handler(stream=None):
- '''
+ """
Return a log handler that by default prints to stderr, but can also be
used to stream to file objects.
Even if it streams to stderr, we have to check if the receiving stream
is a TTY, since stderr could have been redirected into a file.
- '''
+ """
handler = logging.StreamHandler(stream=stream)
- FORMAT = "%(asctime)s [$BOLD%(name)s$RESET] %(processName)s
%(levelname)s: %(message)s"
+ format_string = "%(asctime)s [$BOLD%(name)s$RESET] " \
+ "%(processName)s %(levelname)s: %(message)s"
datefmt = '%Y-%m-%d %H:%M:%S'
if hasattr(handler.stream, "fileno") and
os.isatty(handler.stream.fileno()):
- handler.setFormatter(_ColoredFormatter(_insert_seqs(FORMAT),
datefmt=datefmt))
+ handler.setFormatter(
+ _ColoredFormatter(_insert_seqs(format_string), datefmt=datefmt))
else:
- handler.setFormatter(logging.Formatter(_remove_seqs(FORMAT),
datefmt=datefmt))
+ handler.setFormatter(
+ logging.Formatter(_remove_seqs(format_string), datefmt=datefmt))
return handler
+
# Initialize the logger that prints to the console.
# The initial level of DEBUG will be overwritten by the command line parsing
console_handler = _get_log_handler()
console_handler.setLevel(logging.DEBUG)
-# Initialize root codeface logger
-# Note that the Level is set to 1, so all logging messages will be passed to
-# the handlers, which will then apply their log level.
+
+
class DevInfoLogger(logging.getLoggerClass()):
+ """
+ Logger with adjustable development levels.
+ """
def devinfo(self, *args):
+ """
+ Initialize root codeface logger
+ Note that the Level is set to 1, so all logging messages will be
passed
+ to the handlers, which will then apply their log level.
+ """
return self.log(DEVINFO_LEVEL, *args)
+
+
logging.setLoggerClass(DevInfoLogger)
log = logging.getLogger("codeface")
log.addHandler(console_handler)
-log.setLevel(1) # pass all messages to the handlers
+log.setLevel(1) # pass all messages to the handlers
