[Rework] Make log pipes worker agnostic, add scanners API

3 files changed, 17 insertions, 12 deletions

diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 3963b43d8..2db607075 100644
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -64,6 +64,12 @@ enum rspamd_log_type {
 	RSPAMD_LOG_FILE
 };
 
+struct rspamd_worker_log_pipe {
+	gint fd;
+	gint type;
+	struct rspamd_worker_log_pipe *prev, *next;
+};
+
 /**
  * script module list item
  */
@@ -328,6 +334,7 @@ struct rspamd_config {
 	gboolean log_re_cache;                          /**< show statistics about regexps						*/
 	guint log_error_elts;                           /**< number of elements in error logbuf					*/
 	guint log_error_elt_maxlen;                     /**< maximum size of error log element					*/
+	struct rspamd_worker_log_pipe *log_pipes;
 
 	gboolean mlock_statfile_pool;                   /**< use mlock (2) for locking statfiles				*/
 	gboolean compat_messages;                       /**< use old messages in the protocol (array) 			*/
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index e8abcd9e6..354e9f082 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -191,6 +191,7 @@ void
 rspamd_config_free (struct rspamd_config *cfg)
 {
 	struct rspamd_config_post_load_script *sc, *sctmp;
+	struct rspamd_worker_log_pipe *lp, *ltmp;
 
 	rspamd_map_remove_all (cfg);
 
@@ -244,6 +245,12 @@ rspamd_config_free (struct rspamd_config *cfg)
 	rspamd_mempool_delete (cfg->cfg_pool);
 	lua_close (cfg->lua_state);
 	REF_RELEASE (cfg->libs_ctx);
+
+	DL_FOREACH_SAFE (cfg->log_pipes, lp, ltmp) {
+		close (lp->fd);
+		g_slice_free1 (sizeof (*lp), lp);
+	}
+
 	g_slice_free1 (sizeof (*cfg), cfg);
 }
 
diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 5656d9458..cbf91027c 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -1401,8 +1401,7 @@ end:
 }
 
 static void
-rspamd_protocol_write_log_pipe (struct rspamd_worker_ctx *ctx,
-		struct rspamd_task *task)
+rspamd_protocol_write_log_pipe (struct rspamd_task *task)
 {
 	struct rspamd_worker_log_pipe *lp;
 	struct rspamd_protocol_log_message_sum *ls;
@@ -1547,7 +1546,7 @@ rspamd_protocol_write_log_pipe (struct rspamd_worker_ctx *ctx,
 
 	nextra = extra->len;
 
-	LL_FOREACH (ctx->log_pipes, lp) {
+	LL_FOREACH (task->cfg->log_pipes, lp) {
 		if (lp->fd != -1) {
 			switch (lp->type) {
 			case RSPAMD_LOG_PIPE_SYMBOLS:
@@ -1628,7 +1627,6 @@ rspamd_protocol_write_reply (struct rspamd_task *task)
 {
 	struct rspamd_http_message *msg;
 	const gchar *ctype = "application/json";
-	struct rspamd_abstract_worker_ctx *actx;
 	rspamd_fstring_t *reply;
 
 	msg = rspamd_http_new_message (HTTP_RESPONSE);
@@ -1678,14 +1676,7 @@ rspamd_protocol_write_reply (struct rspamd_task *task)
 		case CMD_SKIP:
 		case CMD_CHECK_V2:
 			rspamd_protocol_http_reply (msg, task);
-
-			if (task->worker && task->worker->ctx) {
-				actx = task->worker->ctx;
-
-				if (actx->magic == rspamd_worker_magic) {
-					rspamd_protocol_write_log_pipe (task->worker->ctx, task);
-				}
-			}
+			rspamd_protocol_write_log_pipe (task);
 			break;
 		case CMD_PING:
 			rspamd_http_message_set_body (msg, "pong" CRLF, 6);