]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
Grr, really fix the logging
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 24 Dec 2015 09:53:33 +0000 (09:53 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 24 Dec 2015 09:53:33 +0000 (09:53 +0000)
src/libserver/re_cache.c

index 5d0694086000f8d240e5d388655ea4820e49731d..7b3bd45c114a16d78b9af331bd45bcb3098143cd 100644 (file)
@@ -1039,13 +1039,22 @@ rspamd_re_cache_compile_hyperscan (struct rspamd_re_cache *cache,
                        total += n;
                        close (fd);
 
-                       msg_info_re_cache (
-                                       "skip already valid class %s(%*s) to cache %6s, %d regexps",
-                                       rspamd_re_cache_type_to_string (re_class->type),
-                                       (gint) re_class->type_len - 1,
-                                       re_class->type_data,
-                                       re_class->hash,
-                                       n);
+                       if (re_class->type_len > 0) {
+                               msg_info_re_cache (
+                                               "skip already valid class %s(%*s) to cache %6s, %d regexps",
+                                               rspamd_re_cache_type_to_string (re_class->type),
+                                               (gint) re_class->type_len - 1,
+                                               re_class->type_data,
+                                               re_class->hash,
+                                               n);
+                       }
+                       else {
+                               msg_info_re_cache (
+                                               "skip already valid class %s to cache %6s, %d regexps",
+                                               rspamd_re_cache_type_to_string (re_class->type),
+                                               re_class->hash,
+                                               n);
+                       }
 
                        continue;
                }
@@ -1206,11 +1215,22 @@ rspamd_re_cache_compile_hyperscan (struct rspamd_re_cache *cache,
                                return -1;
                        }
 
-                       msg_info_re_cache ("compiled class %s(%*s) to cache %6s, %d regexps",
-                                       rspamd_re_cache_type_to_string (re_class->type),
-                                       (gint)re_class->type_len - 1,
-                                       re_class->type_data,
-                                       re_class->hash, n);
+                       if (re_class->type_len > 0) {
+                               msg_info_re_cache (
+                                               "compiled class %s(%*s) to cache %6s, %d regexps",
+                                               rspamd_re_cache_type_to_string (re_class->type),
+                                               (gint) re_class->type_len - 1,
+                                               re_class->type_data,
+                                               re_class->hash,
+                                               n);
+                       }
+                       else {
+                               msg_info_re_cache (
+                                               "compiled class %s to cache %6s, %d regexps",
+                                               rspamd_re_cache_type_to_string (re_class->type),
+                                               re_class->hash,
+                                               n);
+                       }
 
                        total += n;