Skip to content
Snippets Groups Projects
Commit 1315ef40 authored by Anael Beutot's avatar Anael Beutot
Browse files

Change logging output in case debug is activated

otherwise log to syslog
parent 57e4c0a3
No related branches found
No related tags found
No related merge requests found
......@@ -43,6 +43,9 @@ class NodeConfigParser(object):
logger.error('Invalid value for debug in config file')
self.debug = False
self.logging_level = int(config.get('verbosity', 0))
self.logging_output = 'console' if self.debug == True else 'syslog'
# path settings
self.jobs_store_path = config.get('jobs_store_path',
'/var/lib/cc-node/jobs')
......@@ -51,11 +54,25 @@ class NodeConfigParser(object):
'/var/lib/cc-node/plugins')
def configure_logging(level):
def configure_logging(level, output):
level = {
0: 'ERROR', 1: 'WARNING',
2: 'INFO', 3: 'DEBUG',
}[level]
output = dict(
console="""
[handler_output]
class=StreamHandler
formatter=simpleFormatter
args=(sys.stderr,)
""",
syslog="""
[handler_output]
class=handlers.SysLogHandler
formatter=simpleFormatter
args=('/dev/log', handlers.SysLogHandler.LOG_DAEMON)
""",
)[output]
# create config parser for logging configuration
logging.config.fileConfig(StringIO("""
......@@ -63,16 +80,14 @@ def configure_logging(level):
keys=root,ccnode,cccommon,sjrpc
[handlers]
# keys=syslog
keys=consoleHandler
keys=output
[formatters]
keys=simpleFormatter
[logger_root]
level=ERROR
# handlers=syslog
handlers=consoleHandler
handlers=output
[logger_ccnode]
level=%(level)s
......@@ -89,16 +104,8 @@ level=ERROR
handlers=
qualname=sjrpc
# [handler_syslog]
# class=handlers.SysLogHandler
# formatter=simpleFormatter
# args=('/dev/log', handlers.SysLogHandler.LOG_DAEMON)
[handler_consoleHandler]
class=StreamHandler
formatter=simpleFormatter
args=(sys.stderr,)
%(output)s
[formatter_simpleFormatter]
format=cc-node - %%(asctime)s - %%(name)s - %%(levelname)s - %%(message)s
""" % dict(level=level)))
""" % dict(level=level, output=output)))
......@@ -74,7 +74,7 @@ class NodeLoop(MainLoop):
self.job_manager = JobManager(self)
def configure_logging(self):
configure_logging(self.config.logging_level)
configure_logging(self.config.logging_level, self.config.logging_output)
def stop(self, watcher=None, revents=None):
MainLoop.stop(self, watcher, revents)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment