Merge branch 'mainstream'

[sliver-openvswitch.git] / python / ovs / vlog.py

diff --git a/python/ovs/vlog.py b/python/ovs/vlog.py
index 7cfa415..14679d9 100644 (file)
--- a/python/ovs/vlog.py
+++ b/python/ovs/vlog.py
@@ -60,7 +60,8 @@ class Vlog:
         if not Vlog.__inited:
             return
 
-        now = datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
+        dt = datetime.datetime.utcnow();
+        now = dt.strftime("%Y-%m-%dT%H:%M:%S.%%iZ") % (dt.microsecond/1000)
         syslog_message = ("%s|%s|%s|%s"
                            % (Vlog.__msg_num, self.name, level, message))
 
@@ -71,7 +72,7 @@ class Vlog:
             f_level = LEVELS.get(f_level, logging.CRITICAL)
             if level >= f_level:
                 if f == "syslog":
-                    message = syslog_message
+                    message = "ovs|" + syslog_message
                 else:
                     message = "%s|%s" % (now, syslog_message)
                 logging.getLogger(f).log(level, message, **kwargs)