Fixed ROSCONSOLE_FORMAT with microseconds (#2370)

ros · Sep 4, 2024 · aef16f0 · aef16f0
1 parent b1ef2ee
commit aef16f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tools/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
@@ -255,7 +255,7 @@ def emit(self, record):
         while '${walltime:' in msg:
             tag_end_index = msg.index('${walltime:') + len('${walltime:')
             time_format = msg[tag_end_index: msg.index('}', tag_end_index)]
-            time_str = time.strftime(time_format)
+            time_str = datetime.datetime.now().strftime(time_format)
             msg = msg.replace('${walltime:' + time_format + '}', time_str)
 
         msg = msg.replace('${thread}', str(record.thread))
@@ -279,7 +279,7 @@ def emit(self, record):
         while '${time:' in msg:
             tag_end_index = msg.index('${time:') + len('${time:')
             time_format = msg[tag_end_index: msg.index('}', tag_end_index)]
-            time_str = time.strftime(time_format)
+            time_str = datetime.datetime.now().strftime(time_format)
 
             if self._get_time is not None and not self._is_wallclock():
                 time_str += ', %f' % self._get_time()

diff --git a/tools/rosgraph/test/test_roslogging.py b/tools/rosgraph/test/test_roslogging.py
@@ -47,15 +47,15 @@
     '${severity}',
     '${message}',
     '${walltime}',
-    '${walltime:%Y-%m-%d %H:%M:%S}',
+    '${walltime:%Y-%m-%d %H:%M:%S.%f}',
     '${thread}',
     '${logger}',
     '${file}',
     '${line}',
     '${function}',
     '${node}',
     '${time}',
-    '${time:%Y-%m-%d %H:%M:%S}',
+    '${time:%Y-%m-%d %H:%M:%S.%f}',
 ])
 rosgraph.roslogging.configure_logging('test_rosgraph', logging.INFO)
 loginfo = logging.getLogger('rosout').info
@@ -113,7 +113,7 @@ def test_rosconsole__logging_format():
                 'INFO',
                 'on ' + loc,
                 r'[0-9]*\.[0-9]*',
-                r'[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}',
+                r'[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{6}',
                 '[0-9]*',
                 'rosout',
                 re.escape(this_file),
@@ -122,7 +122,7 @@ def test_rosconsole__logging_format():
                 # depending if rospy.get_name() is available
                 '(/unnamed|<unknown_node_name>)',
                 r'[0-9]*\.[0-9]*',
-                r'[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}',
+                r'[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{6}',
             ])
             assert_regexp_matches(lout.getvalue().splitlines()[i], log_out)