[Rework] Improve bayes debug logging, remove unused stuff

3 files changed, 42 insertions, 22 deletions

diff --git a/src/libstat/classifiers/bayes.c b/src/libstat/classifiers/bayes.c
index ee2125457..edaae4e79 100644
--- a/src/libstat/classifiers/bayes.c
+++ b/src/libstat/classifiers/bayes.c
@@ -38,7 +38,7 @@
         G_STRFUNC, \
         __VA_ARGS__)
 
-INIT_LOG_MODULE(bayes)
+INIT_LOG_MODULE_PUBLIC(bayes)
 
 static inline GQuark
 bayes_error_quark (void)
@@ -254,13 +254,20 @@ bayes_classify_token (struct rspamd_classifier *ctx,
 
 
 gboolean
-bayes_init (rspamd_mempool_t *pool, struct rspamd_classifier *cl)
+bayes_init (struct rspamd_config *cfg,
+			struct event_base *ev_base,
+			struct rspamd_classifier *cl)
 {
 	cl->cfg->flags |= RSPAMD_FLAG_CLASSIFIER_INTEGER;
 
 	return TRUE;
 }
 
+void
+bayes_fin (struct rspamd_classifier *cl)
+{
+}
+
 gboolean
 bayes_classify (struct rspamd_classifier * ctx,
 		GPtrArray *tokens,
diff --git a/src/libstat/classifiers/classifiers.h b/src/libstat/classifiers/classifiers.h
index e30f2153a..fd6daf433 100644
--- a/src/libstat/classifiers/classifiers.h
+++ b/src/libstat/classifiers/classifiers.h
@@ -3,6 +3,7 @@
 
 #include "config.h"
 #include "mem_pool.h"
+#include <event.h>
 
 #define RSPAMD_DEFAULT_CLASSIFIER "bayes"
 /* Consider this value as 0 */
@@ -10,28 +11,32 @@
 
 struct rspamd_classifier_config;
 struct rspamd_task;
+struct rspamd_config;
 struct rspamd_classifier;
 
 struct token_node_s;
 
 struct rspamd_stat_classifier {
 	char *name;
-	gboolean (*init_func)(rspamd_mempool_t *pool,
-			struct rspamd_classifier *cl);
+	gboolean (*init_func)(struct rspamd_config *cfg,
+						  struct event_base *ev_base,
+						  struct rspamd_classifier *cl);
 	gboolean (*classify_func)(struct rspamd_classifier * ctx,
-			GPtrArray *tokens,
-			struct rspamd_task *task);
+							  GPtrArray *tokens,
+							  struct rspamd_task *task);
 	gboolean (*learn_spam_func)(struct rspamd_classifier * ctx,
-			GPtrArray *input,
-			struct rspamd_task *task,
-			gboolean is_spam,
-			gboolean unlearn,
-			GError **err);
+								GPtrArray *input,
+								struct rspamd_task *task,
+								gboolean is_spam,
+								gboolean unlearn,
+								GError **err);
+	void (*fin_func)(struct rspamd_classifier *cl);
 };
 
 /* Bayes algorithm */
-gboolean bayes_init (rspamd_mempool_t *pool,
-		struct rspamd_classifier *);
+gboolean bayes_init (struct rspamd_config *cfg,
+					 struct event_base *ev_base,
+					 struct rspamd_classifier *);
 gboolean bayes_classify (struct rspamd_classifier *ctx,
 		GPtrArray *tokens,
 		struct rspamd_task *task);
@@ -41,10 +46,12 @@ gboolean bayes_learn_spam (struct rspamd_classifier *ctx,
 		gboolean is_spam,
 		gboolean unlearn,
 		GError **err);
+void bayes_fin (struct rspamd_classifier *);
 
 /* Generic lua classifier */
-gboolean lua_classifier_init (rspamd_mempool_t *pool,
-		struct rspamd_classifier *);
+gboolean lua_classifier_init (struct rspamd_config *cfg,
+							  struct event_base *ev_base,
+							  struct rspamd_classifier *);
 gboolean lua_classifier_classify (struct rspamd_classifier *ctx,
 		GPtrArray *tokens,
 		struct rspamd_task *task);
@@ -55,6 +62,11 @@ gboolean lua_classifier_learn_spam (struct rspamd_classifier *ctx,
 		gboolean unlearn,
 		GError **err);
 
+extern guint rspamd_bayes_log_id;
+#define msg_debug_bayes(...)  rspamd_conditional_debug_fast (NULL, task->from_addr, \
+        rspamd_bayes_log_id, "bayes", task->task_pool->tag.uid, \
+        G_STRFUNC, \
+        __VA_ARGS__)
 
 #endif
 /*
diff --git a/src/libstat/classifiers/lua_classifier.c b/src/libstat/classifiers/lua_classifier.c
index 7b495b165..83ce7b0e1 100644
--- a/src/libstat/classifiers/lua_classifier.c
+++ b/src/libstat/classifiers/lua_classifier.c
@@ -47,8 +47,9 @@ static GHashTable *lua_classifiers = NULL;
 INIT_LOG_MODULE(luacl)
 
 gboolean
-lua_classifier_init (rspamd_mempool_t *pool,
-		struct rspamd_classifier *cl)
+lua_classifier_init (struct rspamd_config *cfg,
+					 struct event_base *ev_base,
+					 struct rspamd_classifier *cl)
 {
 	struct rspamd_lua_classifier_ctx *ctx;
 	lua_State *L = cl->ctx->cfg->lua_state;
@@ -62,7 +63,7 @@ lua_classifier_init (rspamd_mempool_t *pool,
 	ctx = g_hash_table_lookup (lua_classifiers, cl->subrs->name);
 
 	if (ctx != NULL) {
-		msg_err_pool ("duplicate lua classifier definition: %s",
+		msg_err_config ("duplicate lua classifier definition: %s",
 				cl->subrs->name);
 
 		return FALSE;
@@ -70,7 +71,7 @@ lua_classifier_init (rspamd_mempool_t *pool,
 
 	lua_getglobal (L, "rspamd_classifiers");
 	if (lua_type (L, -1) != LUA_TTABLE) {
-		msg_err_pool ("cannot register classifier %s: no rspamd_classifier global",
+		msg_err_config ("cannot register classifier %s: no rspamd_classifier global",
 				cl->subrs->name);
 		lua_pop (L, 1);
 
@@ -81,7 +82,7 @@ lua_classifier_init (rspamd_mempool_t *pool,
 	lua_gettable (L, -2);
 
 	if (lua_type (L, -1) != LUA_TTABLE) {
-		msg_err_pool ("cannot register classifier %s: bad lua type: %s",
+		msg_err_config ("cannot register classifier %s: bad lua type: %s",
 				cl->subrs->name, lua_typename (L, lua_type (L, -1)));
 		lua_pop (L, 2);
 
@@ -92,7 +93,7 @@ lua_classifier_init (rspamd_mempool_t *pool,
 	lua_gettable (L, -2);
 
 	if (lua_type (L, -1) != LUA_TFUNCTION) {
-		msg_err_pool ("cannot register classifier %s: bad lua type for classify: %s",
+		msg_err_config ("cannot register classifier %s: bad lua type for classify: %s",
 				cl->subrs->name, lua_typename (L, lua_type (L, -1)));
 		lua_pop (L, 3);
 
@@ -105,7 +106,7 @@ lua_classifier_init (rspamd_mempool_t *pool,
 	lua_gettable (L, -2);
 
 	if (lua_type (L, -1) != LUA_TFUNCTION) {
-		msg_err_pool ("cannot register classifier %s: bad lua type for learn: %s",
+		msg_err_config ("cannot register classifier %s: bad lua type for learn: %s",
 				cl->subrs->name, lua_typename (L, lua_type (L, -1)));
 		lua_pop (L, 3);