openstack
/
fuel-web
Code Issues Proposed changes

Sends netprobe logs to master from bootstrap node 

Boostrap nodes don't sends syslog message to master. We use a special
script (send2syslog.py) for this purpose. Unfortunely, it knows nothing
about netprobe, so the log wasn't sent.

Since now, the problem is fixed.

Depends on: https://review.openstack.org/#/c/90338/

Closes-Bug: #1291663
Change-Id: If8e350f981fb01e117163e460dd5f8e4774e2dc5
This commit is contained in:
Igor Kalnitsky 2014-04-24 19:10:04 +03:00
parent dcaed120b3
commit afaf27ec6e
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/send2syslog.py
View File

@ -71,7 +71,17 @@ msg_levels = {'ruby': {'regex': '(?P<level>[DIWEF]), \[[0-9-]{10}T',
'ERROR': logging.ERROR,
'CRITICAL': logging.CRITICAL
}
},
'netprobe': {'regex': ('[0-9-]{10} [0-9:]{8},[0-9]+ (?P<level>'
'DEBUG|INFO|WARNING|ERROR|CRITICAL)'),
'levels': {'DEBUG': logging.DEBUG,
'INFO': logging.INFO,
'WARNING': logging.WARNING,
'ERROR': logging.ERROR,
'CRITICAL': logging.CRITICAL
}
}
}
relevel_errors = {
'anaconda': [

10
network_checker/net_check/api.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/python
# Copyright 2014 Mirantis, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
@ -82,7 +83,7 @@ class Actor(object):
def _define_logger(self, filename=None,
appname='netprobe', level=logging.DEBUG):
logger = logging.getLogger()
logger = logging.getLogger(appname)
logger.setLevel(level)
syslog_formatter = logging.Formatter(
@ -97,8 +98,9 @@ class Actor(object):
# this handler.
if filename:
file_formatter = logging.Formatter(
'%(asctime)s %(name)-12s %(levelname)-8s %(message)s'
'%(asctime)s %(levelname)s %(name)s %(message)s'
)
file_handler = logging.FileHandler(filename)
file_handler.setFormatter(file_formatter)
logger.addHandler(file_handler)
@ -333,7 +335,7 @@ class Actor(object):
class Sender(Actor):
def __init__(self, config=None):
self.logger = self._define_logger('/root/netprobe_sender.log',
self.logger = self._define_logger('/var/log/netprobe_sender.log',
'netprobe_sender')
super(Sender, self).__init__(config)
self.logger.info("=== Starting Sender ===")
@ -384,7 +386,7 @@ class Sender(Actor):
class Listener(Actor):
def __init__(self, config=None):
self.logger = self._define_logger('/root/netprobe_listener.log',
self.logger = self._define_logger('/var/log/netprobe_listener.log',
'netprobe_listener')
super(Listener, self).__init__(config)
self.logger.info("=== Starting Listener ===")