tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Kozea/Radicale

Browse Source
This commit is contained in:
Guillaume Ayoub 2013-07-09 13:08:30 +02:00
commit 891aa9dcb6
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
radicale/log.py
View File

@ -33,21 +33,25 @@ from . import config
LOGGER = logging.getLogger() LOGGER = logging.getLogger()
FILENAME = os.path.expanduser(config.get("logging", "config"))
def start(): def start():
filename = os.path.expanduser(config.get("logging", "config"))
debug = config.getboolean("logging", "debug")
"""Start the logging according to the configuration.""" """Start the logging according to the configuration."""
if os.path.exists(FILENAME): if os.path.exists(filename):
# Configuration taken from file # Configuration taken from file
logging.config.fileConfig(FILENAME) logging.config.fileConfig(filename)
if debug:
LOGGER.setLevel(logging.DEBUG)
for handler in LOGGER.handlers:
handler.setLevel(logging.DEBUG)
else: else:
# Default configuration, standard output # Default configuration, standard output
handler = logging.StreamHandler(sys.stdout) handler = logging.StreamHandler(sys.stdout)
handler.setFormatter(logging.Formatter("%(message)s")) handler.setFormatter(logging.Formatter("%(message)s"))
LOGGER.addHandler(handler) LOGGER.addHandler(handler)
if debug:
if config.getboolean("logging", "debug"):
LOGGER.setLevel(logging.DEBUG) LOGGER.setLevel(logging.DEBUG)
for handler in LOGGER.handlers: LOGGER.debug("Logging configuration file '%s' not found, using stdout."
handler.setLevel(logging.DEBUG) % filename)