[Rework] Eliminate virtual scan time as it is useless

diff --git a/conf/logging.inc b/conf/logging.inc
index 2511d968f9829f30424f4322c2c426841c23f8fc..f0104342a81874063d6815cf8f4f7257acab7499 100644 (file)
--- a/conf/logging.inc
+++ b/conf/logging.inc
@@ -4,7 +4,7 @@ level = "info";
 log_format =<<EOD
 id: <$mid>,$if_qid{ qid: <$>,}$if_ip{ ip: $,}$if_user{ user: $,}$if_smtp_from{ from: <$>,}
 (default: $is_spam ($action): [$scores] [$symbols_scores_params]),
-len: $len, time: $time_real real, $time_virtual virtual, dns req: $dns_req,
+len: $len, time: $time_real, dns req: $dns_req,
 digest: <$digest>$if_smtp_rcpts{, rcpts: <$>}$if_mime_rcpts{, mime_rcpts: <$>}$if_filename{, file: $}$if_forced_action{, forced: $}
 EOD
 

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 055a6693098a1bcabefc291dba18b11be1ff493f..f65883c3e4b7ccb9bb07cbbc6edf2228b8454298 100644 (file)
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -193,8 +193,8 @@ rspamd_config_new (enum rspamd_config_init_flags flags)
        /* Default log line */
        cfg->log_format_str = "id: <$mid>,$if_qid{ qid: <$>,}$if_ip{ ip: $,}"
                        "$if_user{ user: $,}$if_smtp_from{ from: <$>,} (default: $is_spam "
-                       "($action): [$scores] [$symbols_scores_params]), len: $len, time: $time_real real,"
-                       " $time_virtual virtual, dns req: $dns_req, digest: <$digest>"
+                       "($action): [$scores] [$symbols_scores_params]), len: $len, time: $time_real, "
+                       "dns req: $dns_req, digest: <$digest>"
                        "$if_smtp_rcpts{ rcpts: <$>, }$if_mime_rcpt{ mime_rcpt: <$>, }";
        /* Allow non-mime input by default */
        cfg->allow_raw_input = TRUE;

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index de2d5aa556c0e42635b780ce6fd6f4868859d78d..77c25697117db761d92da9174837333662409e19 100644 (file)
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -1314,9 +1314,6 @@ rspamd_protocol_write_ucl (struct rspamd_task *task,
                ucl_object_insert_key (top,
                                ucl_object_fromdouble (task->time_real_finish - task->task_timestamp),
                                "time_real", 0, false);
-               ucl_object_insert_key (top,
-                               ucl_object_fromdouble (task->time_virtual_finish - task->time_virtual),
-                               "time_virtual", 0, false);
        }
 
        if (flags & RSPAMD_PROTOCOL_DKIM) {

diff --git a/src/libserver/task.c b/src/libserver/task.c
index 54f2510a2ce1ed4b8c7cc557d6eaa1cf37709d32..778ca4ef58ff4d4d4a25574d6d6d8402e50eabf1 100644 (file)
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -100,7 +100,6 @@ rspamd_task_new (struct rspamd_worker *worker, struct rspamd_config *cfg,
        }
 
        new_task->time_real_finish = NAN;
-       new_task->time_virtual_finish = NAN;
 
        if (pool == NULL) {
                new_task->task_pool =
@@ -1372,8 +1371,8 @@ rspamd_task_log_variable (struct rspamd_task *task,
                var.len = strlen (var.begin);
                break;
        case RSPAMD_LOG_TIME_VIRTUAL:
-               var.begin = rspamd_log_check_time (task->time_virtual,
-                               task->time_virtual_finish,
+               var.begin = rspamd_log_check_time (task->task_timestamp,
+                               task->time_real_finish,
                                task->cfg->clock_res);
                var.len = strlen (var.begin);
                break;
@@ -1693,7 +1692,6 @@ rspamd_task_set_finish_time (struct rspamd_task *task)
 {
        if (isnan (task->time_real_finish)) {
                task->time_real_finish = ev_time ();
-               task->time_virtual_finish = ev_now (task->event_loop);
 
                return TRUE;
        }

diff --git a/src/libserver/task.h b/src/libserver/task.h
index 67f33488ab812bc23b9b0120ec2ef303572a8b6d..5a6c85a0481ca4e0124909f9b44e2e2ecd4e7e67 100644 (file)
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -188,7 +188,6 @@ struct rspamd_task {
        rspamd_mempool_t *task_pool;                    /**< memory pool for task                                                       */
        double time_virtual;
        double time_real_finish;
-       double time_virtual_finish;
        ev_tstamp task_timestamp;
 
        gboolean (*fin_callback) (struct rspamd_task *task, void *arg);

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index 9fe61e07de8be4493b6e9eff5e2239d1b9086acb..41ee110e32e20fbcae3b3638da752291c6786ebc 100644 (file)
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -4656,8 +4656,9 @@ lua_task_get_scan_time (lua_State *L)
                }
 
                rspamd_task_set_finish_time (task);
-               lua_pushnumber (L, task->time_real_finish - task->task_timestamp);
-               lua_pushnumber (L, task->time_virtual_finish - task->time_virtual);
+               gdouble diff = task->time_real_finish - task->task_timestamp;
+               lua_pushnumber (L, diff);
+               lua_pushnumber (L, diff);
 
                if (!set) {
                        /* Reset to nan to allow further calcs in rspamd_task_set_finish_time */

diff --git a/src/plugins/lua/clickhouse.lua b/src/plugins/lua/clickhouse.lua
index 83e9b714d21535461f6d9fec2e49df0166109341..8762de239562a9b77b56f6ecfb8eb784a73bbd1e 100644 (file)
--- a/src/plugins/lua/clickhouse.lua
+++ b/src/plugins/lua/clickhouse.lua
@@ -132,7 +132,7 @@ CREATE TABLE rspamd
     `Symbols.Scores` Array(Float32) COMMENT 'Symbol score',
     `Symbols.Options` Array(String) COMMENT 'Symbol options (comma separated list)',
     ScanTimeReal UInt32 COMMENT 'Request time in milliseconds',
-    ScanTimeVirtual UInt32,
+    ScanTimeVirtual UInt32 COMMENT 'Deprecated do not use',
     AuthUser String COMMENT 'Username for authenticated SMTP client',
     SettingsId LowCardinality(String) COMMENT 'ID for the settings profile',
     Digest FixedString(32) COMMENT '[Deprecated]',
@@ -269,7 +269,6 @@ local function clickhouse_main_row(res)
     'MimeRecipients',
     'MessageId',
     'ScanTimeReal',
-    'ScanTimeVirtual',
     -- 1.9.3 +
     'CustomAction',
     -- 2.0 +
@@ -622,12 +621,12 @@ local function clickhouse_collect(task)
     subject = lua_util.maybe_obfuscate_string(task:get_subject() or '', settings, 'subject')
   end
 
-  local scan_real,scan_virtual = task:get_scan_time()
-  scan_real,scan_virtual = math.floor(scan_real * 1000), math.floor(scan_virtual * 1000)
+  local scan_real = task:get_scan_time()
+  scan_real = math.floor(scan_real * 1000)
   if scan_real < 0 then
     rspamd_logger.messagex(task,
-        'clock skew detected for message: %s ms real scan time (reset to 0), %s virtual scan time',
-        scan_real, scan_virtual)
+        'clock skew detected for message: %s ms real scan time (reset to 0)',
+        scan_real)
     scan_real = 0
   end
 
@@ -677,7 +676,6 @@ local function clickhouse_collect(task)
     mime_recipients,
     message_id,
     scan_real,
-    scan_virtual,
     custom_action,
     auth_user,
     settings_id