server timestamp added to log messages

mymarilyn · May 10, 2024 · 3666f5d · 3666f5d
1 parent e4d3fb5
commit 3666f5d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/clickhouse_driver/log.py b/clickhouse_driver/log.py
@@ -38,8 +38,10 @@ def log_block(block):
         thread_id = row.get('thread_id') or row['thread_number']
 
         logger.info(
-            '[ %s ] [ %s ] {%s} <%s> %s: %s',
+            '[ %s ] %s.%06d [ %s ] {%s} <%s> %s: %s',
             row['host_name'],
+            row['event_time'],
+            row['event_time_microseconds'],
             thread_id,
             row['query_id'],
             priority,

diff --git a/docs/features.rst b/docs/features.rst
@@ -246,14 +246,14 @@ Query logs can be received from server by using `send_logs_level` setting:
         >>>
         >>> settings = {'send_logs_level': 'debug'}
         >>> client.execute('SELECT 1', settings=settings)
-        2018-12-14 10:24:53,873 INFO     clickhouse_driver.log: [ klebedev-ThinkPad-T460 ] [ 25 ] {b328ad33-60e8-4012-b4cc-97f44a7b28f2} <Debug> executeQuery: (from 127.0.0.1:57762) SELECT 1
-        2018-12-14 10:24:53,874 INFO     clickhouse_driver.log: [ klebedev-ThinkPad-T460 ] [ 25 ] {b328ad33-60e8-4012-b4cc-97f44a7b28f2} <Debug> executeQuery: Query pipeline:
+        2018-12-14 10:24:53,873 INFO     clickhouse_driver.log: [ klebedev-ThinkPad-T460 ] 2018-12-14 10:24:53.864869 [ 25 ] {b328ad33-60e8-4012-b4cc-97f44a7b28f2} <Debug> executeQuery: (from 127.0.0.1:57762) SELECT 1
+        2018-12-14 10:24:53,874 INFO     clickhouse_driver.log: [ klebedev-ThinkPad-T460 ] 2018-12-14 10:24:53.865913 [ 25 ] {b328ad33-60e8-4012-b4cc-97f44a7b28f2} <Debug> executeQuery: Query pipeline:
         Expression
          Expression
           One
 
-        2018-12-14 10:24:53,875 INFO     clickhouse_driver.log: [ klebedev-ThinkPad-T460 ] [ 25 ] {b328ad33-60e8-4012-b4cc-97f44a7b28f2} <Information> executeQuery: Read 1 rows, 1.00 B in 0.004 sec., 262 rows/sec., 262.32 B/sec.
-        2018-12-14 10:24:53,875 INFO     clickhouse_driver.log: [ klebedev-ThinkPad-T460 ] [ 25 ] {b328ad33-60e8-4012-b4cc-97f44a7b28f2} <Debug> MemoryTracker: Peak memory usage (for query): 40.23 KiB.
+        2018-12-14 10:24:53,875 INFO     clickhouse_driver.log: [ klebedev-ThinkPad-T460 ] 2018-12-14 10:24:53.869476 [ 25 ] {b328ad33-60e8-4012-b4cc-97f44a7b28f2} <Information> executeQuery: Read 1 rows, 1.00 B in 0.004 sec., 262 rows/sec., 262.32 B/sec.
+        2018-12-14 10:24:53,875 INFO     clickhouse_driver.log: [ klebedev-ThinkPad-T460 ] 2018-12-14 10:24:53.870490 [ 25 ] {b328ad33-60e8-4012-b4cc-97f44a7b28f2} <Debug> MemoryTracker: Peak memory usage (for query): 40.23 KiB.
         [(1,)]