]> source.dussan.org Git - rspamd.git/commitdiff
Add pre-result as `reason` key for the output.
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 23 Sep 2014 15:38:18 +0000 (16:38 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 23 Sep 2014 15:38:18 +0000 (16:38 +0100)
src/client/rspamc.c
src/libserver/protocol.c

index f347eabd1d66210c29b9741dd32a51794d7ccf33..74f5ae1118fa9570cc2d6c5f933db8e52fd9b9f9 100644 (file)
@@ -501,6 +501,10 @@ rspamc_symbols_output (ucl_object_t *obj)
                        rspamd_fprintf (stdout, "Scan error: %s\n", ucl_object_tostring (
                                        cur));
                }
+               else if (g_ascii_strcasecmp (ucl_object_key (cur), "reason") == 0) {
+                       rspamd_fprintf (stdout, "Reason: %s\n", ucl_object_tostring (
+                                       cur));
+               }
                else if (cur->type == UCL_OBJECT) {
                        /* Parse metric */
                        rspamc_metric_output (cur);
index 56f29071c64c2480b82a499b09961517d146ccc9..9ecb3c64215fc141c015f693dd9dbe3ef6b27295 100644 (file)
@@ -790,6 +790,7 @@ rspamd_protocol_http_reply (struct rspamd_http_message *msg,
                rspamd_http_message_add_header (msg, hn->str, hv->str);
        }
 
+
        g_hash_table_iter_init (&hiter, task->results);
 
        top = ucl_object_typed_new (UCL_OBJECT);
@@ -800,6 +801,11 @@ rspamd_protocol_http_reply (struct rspamd_http_message *msg,
                ucl_object_insert_key (top, obj, h, 0, false);
        }
 
+       if (task->pre_result.str != NULL) {
+               ucl_object_insert_key (top, ucl_object_fromstring (task->pre_result.str),
+                               "reason", 0, false);
+       }
+
        if (task->messages != NULL) {
                ucl_object_insert_key (top, rspamd_str_list_ucl (
                                task->messages), "messages", 0, false);