From f03be93115d30c13b3fcf43fb53fa3872600c1f8 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 23 Sep 2014 17:00:11 +0100 Subject: [PATCH] Show messages in rspamc. --- src/client/rspamc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/client/rspamc.c b/src/client/rspamc.c index 74f5ae111..3107c74f4 100644 --- a/src/client/rspamc.c +++ b/src/client/rspamc.c @@ -474,8 +474,8 @@ rspamc_metric_output (const ucl_object_t *obj) static void rspamc_symbols_output (ucl_object_t *obj) { - ucl_object_iter_t it = NULL; - const ucl_object_t *cur; + ucl_object_iter_t it = NULL, mit = NULL; + const ucl_object_t *cur, *cmesg; gchar *emitted; while ((cur = ucl_iterate_object (obj, &it, true)) != NULL) { @@ -501,9 +501,14 @@ 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 (g_ascii_strcasecmp (ucl_object_key (cur), "messages") == 0) { + if (cur->type == UCL_ARRAY) { + mit = NULL; + while ((cmesg = ucl_iterate_object (cur, &mit, true)) != NULL) { + rspamd_fprintf (stdout, "Message: %s\n", + ucl_object_tostring (cmesg)); + } + } } else if (cur->type == UCL_OBJECT) { /* Parse metric */ -- 2.39.5