From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 24 Dec 2015 09:53:33 +0000 (+0000)
Subject: Grr, really fix the logging
X-Git-Tag: 1.1.0~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53631f158a5804d476010030ecf24f262ce15e74;p=thirdparty%2Frspamd.git

Grr, really fix the logging
---

diff --git a/src/libserver/re_cache.c b/src/libserver/re_cache.c
index 5d06940860..7b3bd45c11 100644
--- a/src/libserver/re_cache.c
+++ b/src/libserver/re_cache.c
@@ -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;