git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://openvswitch.org/openvswitch
[sliver-openvswitch.git]
/
python
/
ovs
/
vlog.py
diff --git
a/python/ovs/vlog.py
b/python/ovs/vlog.py
index
f7ace66
..
7cfa415
100644
(file)
--- a/
python/ovs/vlog.py
+++ b/
python/ovs/vlog.py
@@
-61,8
+61,8
@@
class Vlog:
return
now = datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
return
now = datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
-
message = ("%s|
%s|%s|%s|%s"
-
% (now,
Vlog.__msg_num, self.name, level, message))
+
syslog_message = ("
%s|%s|%s|%s"
+
% (
Vlog.__msg_num, self.name, level, message))
level = LEVELS.get(level.lower(), logging.DEBUG)
Vlog.__msg_num += 1
level = LEVELS.get(level.lower(), logging.DEBUG)
Vlog.__msg_num += 1
@@
-70,6
+70,10
@@
class Vlog:
for f, f_level in Vlog.__mfl[self.name].iteritems():
f_level = LEVELS.get(f_level, logging.CRITICAL)
if level >= f_level:
for f, f_level in Vlog.__mfl[self.name].iteritems():
f_level = LEVELS.get(f_level, logging.CRITICAL)
if level >= f_level:
+ if f == "syslog":
+ message = syslog_message
+ else:
+ message = "%s|%s" % (now, syslog_message)
logging.getLogger(f).log(level, message, **kwargs)
def emer(self, message, **kwargs):
logging.getLogger(f).log(level, message, **kwargs)
def emer(self, message, **kwargs):