Use UTC consistently instead of local timezone.

Signed-off-by: Arun Sharma <arun.sharma@calsoftinc.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/NEWS b/NEWS
index f0b24907ea8bbff0558747df6637f18bc6b15dd2..550cf5973e96611840ac400ec38dcd7dad900944 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -20,6 +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.
 
 
 v1.7.0 - xx xxx xxxx

diff --git a/lib/table.c b/lib/table.c
index a8b35e216f484b64a85eb38e9cb28c29a9e2c063..f24ddc62e5cde843334c9dd117e37000157b78b1 100644 (file)
--- a/lib/table.c
+++ b/lib/table.c
@@ -224,7 +224,7 @@ static void
 table_format_timestamp__(char *s, size_t size)
 {
     time_t now = time_wall();
-    strftime(s, size, "%Y-%m-%d %H:%M:%S", localtime(&now));
+    strftime(s, size, "%Y-%m-%d %H:%M:%S", gmtime(&now));
 }
 
 static void

diff --git a/lib/vlog.c b/lib/vlog.c
index e5c5feb7bdd61b559e90205f7da2cae78cc07442..d26e61391e58f7fc3b52171f87faf1e0abfc9794 100644 (file)
--- a/lib/vlog.c
+++ b/lib/vlog.c
@@ -498,8 +498,8 @@ vlog_init(void)
         struct tm tm;
         char s[128];
 
-        localtime_r(&now, &tm);
-        strftime(s, sizeof s, "%a, %d %b %Y %H:%M:%S %z", &tm);
+        gmtime_r(&now, &tm);
+        strftime(s, sizeof s, "%a, %d %b %Y %H:%M:%S", &tm);
         VLOG_ERR("current time is negative: %s (%ld)", s, (long int) now);
     }
 

diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c
index f680989677617ff9d263137c42225f3d7a19c0a0..f5412f36b7b5295881ebdc117895559b84bf1b4f 100644 (file)
--- a/ovsdb/ovsdb-tool.c
+++ b/ovsdb/ovsdb-tool.c
@@ -513,7 +513,7 @@ do_show_log(int argc, char *argv[])
                 time_t t = json_integer(date);
                 char s[128];
 
-                strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S", localtime(&t));
+                strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S", gmtime(&t));
                 printf(" %s", s);
             }
 

diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
index a2dfabf60c587d76792f0931b4dd3287b9d31d2a..dbc46cd4197bd76dbffc12ce2c7e7df0b799d440 100644 (file)
--- a/utilities/ovs-ofctl.c
+++ b/utilities/ovs-ofctl.c
@@ -1127,7 +1127,7 @@ monitor_vconn(struct vconn *vconn)
                 time_t now = time_wall();
                 char s[32];
 
-                strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S: ", localtime(&now));
+                strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S: ", gmtime(&now));
                 fputs(s, stderr);
             }