Improve hyperscan compiler helper logging

diff --git a/src/hs_helper.c b/src/hs_helper.c
index d8ffd9e010e0ec20ef087ffe12498aa5432311f0..260d26674e2716409fd6ce71d97facce6348beb8 100644 (file)
--- a/src/hs_helper.c
+++ b/src/hs_helper.c
@@ -32,8 +32,6 @@
 
 #ifdef HAVE_GLOB_H
 #include <glob.h>
-#include <libserver/rspamd_control.h>
-
 #endif
 
 static gpointer init_hs_helper (struct rspamd_config *cfg);
@@ -91,6 +89,14 @@ init_hs_helper (struct rspamd_config *cfg)
                        G_STRUCT_OFFSET (struct hs_helper_ctx, max_time),
                        RSPAMD_CL_FLAG_TIME_FLOAT,
                        "Maximum time to wait for compilation of a single expression");
+       rspamd_rcl_register_worker_option (cfg,
+                       type,
+                       "timeout",
+                       rspamd_rcl_parse_struct_time,
+                       ctx,
+                       G_STRUCT_OFFSET (struct hs_helper_ctx, max_time),
+                       RSPAMD_CL_FLAG_TIME_FLOAT,
+                       "Maximum time to wait for compilation of a single expression");
 
        return ctx;
 }

diff --git a/src/libserver/re_cache.c b/src/libserver/re_cache.c
index 6b86dc9e0b7a0bee67cc21a04020d6eae8e6f060..e9a18cfdd26cdb72ed1e75d6757adce55db99103 100644 (file)
--- a/src/libserver/re_cache.c
+++ b/src/libserver/re_cache.c
@@ -985,7 +985,7 @@ rspamd_re_cache_is_finite (struct rspamd_re_cache *cache,
                                return TRUE;
                        }
                        else {
-                               msg_info_re_cache (
+                               msg_err_re_cache (
                                                "cannot approximate %s to hyperscan",
                                                rspamd_regexp_get_pattern (re));
 
@@ -996,7 +996,7 @@ rspamd_re_cache_is_finite (struct rspamd_re_cache *cache,
                        /* We consider that as timeout */
                        kill (cld, SIGKILL);
                        g_assert (waitpid (cld, &status, 0) != -1);
-                       msg_info_re_cache (
+                       msg_err_re_cache (
                                        "cannot approximate %s to hyperscan: timeout waiting",
                                        rspamd_regexp_get_pattern (re));
                        signal (SIGCHLD, SIG_IGN);