From: Arun Sharma Date: Mon, 2 Jul 2012 11:32:44 +0000 (-0700) Subject: Python daemons: Changed log date time format. X-Git-Tag: sliver-openvswitch-1.8.90-0~48^2~297 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=969e46a224d433ea60878252c607ad65371bc00d Python daemons: Changed log date time format. Changed the python daemons log date and time format to keep similar as C binaries logging format. The date time is in UTC. Signed-off-by: Arun Sharma Signed-off-by: Ben Pfaff --- diff --git a/NEWS b/NEWS index 550cf5973..a858f9e8b 100644 --- a/NEWS +++ b/NEWS @@ -20,8 +20,8 @@ post-v1.7.0 - Open vSwitch now sends RARP packets in situations where it previously sent a custom protocol, making it consistent with behavior of QEMU and VMware. - - "ovsdb-tool show-log" and the --timestamp options on ovsdb-client and - ovs-ofctl now display timestamps in UTC instead of the local timezone. + - All Open vSwitch programs and log files now show timestamps in UTC, + instead the local timezone, by default. v1.7.0 - xx xxx xxxx diff --git a/python/ovs/vlog.py b/python/ovs/vlog.py index ed950123c..f7ace66fd 100644 --- a/python/ovs/vlog.py +++ b/python/ovs/vlog.py @@ -60,7 +60,7 @@ class Vlog: if not Vlog.__inited: return - now = datetime.datetime.now().strftime("%b %d %H:%M:%S") + 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)) diff --git a/tests/vlog.at b/tests/vlog.at index 27ec79e6c..2bc7b5ce0 100644 --- a/tests/vlog.at +++ b/tests/vlog.at @@ -9,7 +9,7 @@ AT_CHECK([$PYTHON $srcdir/test-vlog.py --log-file log_file \ AT_CHECK([diff log_file stderr_log]) -AT_CHECK([sed -e 's/.* .* ..:..:..|//' \ +AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z|//' \ -e 's/File ".*", line [[0-9]][[0-9]]*,/File , line ,/' \ stderr_log], [0], [dnl 0|module_0|EMER|emergency