mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-03 15:55:19 +00:00
Code Issues Releases Wiki Activity

vlog: Ability to override the default log facility.

Browse Source 
When Open vSwitch is run in hundreds of hypervisors, it is
useful to collect log messages through log collectors. To
collect log messages like this, it is useful to log them
in a particular RFC5424 facility in the local system. The
log collectors can then be used to collect logs anytime
desired.

This commit provides a sysadmin the ability to specify the
facility through which the log messages are logged.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Gurucharan Shetty
2015-01-26 08:04:25 -08:00
parent 1667bb3498
commit d69d61c7c1
6 changed files with 199 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
python/ovs/vlog.py
View File

@@ -40,6 +40,11 @@ LEVELS = {
"emer": logging.CRITICAL,
"off": logging.CRITICAL
}
FACILITIES = ['auth', 'authpriv', 'cron', 'daemon', 'ftp', 'kern', 'lpr',
'mail', 'news', 'syslog', 'user', 'uucp', 'local0', 'local1',
'local2', 'local3', 'local4', 'local5', 'local6', 'local7']
syslog_facility = "daemon"
syslog_handler = ''
def get_level(level_str):
@@ -224,9 +229,7 @@ class Vlog:
if f == "console":
logger.addHandler(logging.StreamHandler(sys.stderr))
elif f == "syslog":
logger.addHandler(logging.handlers.SysLogHandler(
address="/dev/log",
facility=logging.handlers.SysLogHandler.LOG_DAEMON))
Vlog.add_syslog_handler()
elif f == "file" and Vlog.__log_file:
Vlog.__file_handler = logging.FileHandler(Vlog.__log_file)
logger.addHandler(Vlog.__file_handler)
@@ -280,6 +283,26 @@ class Vlog:
destination = destination.lower()
Vlog.__log_patterns[destination] = pattern
@staticmethod
def add_syslog_handler(facility=None):
global syslog_facility, syslog_handler
# If handler is already added and there is no change in 'facility',
# there is nothing to do.
if (not facility or facility == syslog_facility) and syslog_handler:
return
if facility:
syslog_facility = facility
logger = logging.getLogger('syslog')
if syslog_handler:
logger.removeHandler(syslog_handler)
syslog_handler = logging.handlers.SysLogHandler(address="/dev/log",
facility=syslog_facility)
logger.addHandler(syslog_handler)
return
@staticmethod
def set_levels_from_string(s):
module = None
@@ -298,6 +321,12 @@ class Vlog:
return "Destination %s does not exist" % words[1]
except IndexError:
return "Please supply a valid pattern and destination"
elif words[0] == "FACILITY":
if words[1] in FACILITIES:
Vlog.add_syslog_handler(words[1])
return
else:
return "Facility %s is invalid" % words[1]
for word in [w.lower() for w in words]:
if word == "any":