farrokhi/munin-graphite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make logging to syslog a flag, as opposed to the default (stderr)

Browse Source
This commit is contained in:
Jeffrey Forman 2014-05-21 20:57:02 -04:00
parent 2e7755740b
commit 8a78456f98
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
m2g-poller.py
View File

@ -371,6 +371,9 @@ def parse_args():
action="store", action="store",
default="servers", default="servers",
help="Prefix used on graphite target's name. Default: %(default)s") help="Prefix used on graphite target's name. Default: %(default)s")
parser.add_argument("--logtosyslog",
action="store_true",
help="Log to syslog. No output on the command line.")
parser.add_argument("--verbose", "-v", parser.add_argument("--verbose", "-v",
choices=[1, 2, 3], choices=[1, 2, 3],
default=2, default=2,
@ -458,9 +461,13 @@ def main():
logger = logging.getLogger() logger = logging.getLogger()
logger.setLevel(logging_level) logger.setLevel(logging_level)
syslog = logging.handlers.SysLogHandler(address='/dev/log') syslog = logging.handlers.SysLogHandler(address='/dev/log')
stdout = logging.StreamHandler(stream=sys.stdout)
formatter = logging.Formatter('MUNIN-GRAPHITE: %(levelname)s %(message)s') formatter = logging.Formatter('MUNIN-GRAPHITE: %(levelname)s %(message)s')
syslog.setFormatter(formatter) syslog.setFormatter(formatter)
logger.addHandler(syslog) if args.logtosyslog:
logger.addHandler(syslog)
else:
logger.addHandler(stdout)
# block for setting handling of signals # block for setting handling of signals
signal.signal(signal.SIGHUP, handler_hup) signal.signal(signal.SIGHUP, handler_hup)