Browse Source

[Fix] Fix reload and hyperscan ready event

MFH: true
tags/1.5.0
Vsevolod Stakhov 7 years ago
parent
commit
213ea1bc48
3 changed files with 9 additions and 5 deletions
  1. 2
    1
      src/hs_helper.c
  2. 3
    1
      src/libserver/rspamd_control.c
  3. 4
    3
      src/libserver/rspamd_control.h

+ 2
- 1
src/hs_helper.c View File

@@ -210,7 +210,8 @@ rspamd_rs_compile (struct hs_helper_ctx *ctx, struct rspamd_worker *worker,
}

srv_cmd.type = RSPAMD_SRV_HYPERSCAN_LOADED;
srv_cmd.cmd.hs_loaded.cache_dir = ctx->hs_dir;
rspamd_strlcpy (srv_cmd.cmd.hs_loaded.cache_dir, ctx->hs_dir,
sizeof (srv_cmd.cmd.hs_loaded.cache_dir));
srv_cmd.cmd.hs_loaded.forced = forced;

rspamd_srv_send_command (worker, ctx->ev_base, &srv_cmd, -1, NULL, NULL);

+ 3
- 1
src/libserver/rspamd_control.c View File

@@ -810,7 +810,9 @@ rspamd_srv_handler (gint fd, short what, gpointer ud)
* We assume that cache dir is shared at the same address for all
* workers
*/
wcmd.cmd.hs_loaded.cache_dir = cmd.cmd.hs_loaded.cache_dir;
rspamd_strlcpy (wcmd.cmd.hs_loaded.cache_dir,
cmd.cmd.hs_loaded.cache_dir,
sizeof (wcmd.cmd.hs_loaded.cache_dir));
wcmd.cmd.hs_loaded.forced = cmd.cmd.hs_loaded.forced;
rspamd_control_broadcast_cmd (srv, &wcmd, rfd,
rspamd_control_hs_io_handler, NULL);

+ 4
- 3
src/libserver/rspamd_control.h View File

@@ -44,7 +44,7 @@ enum rspamd_srv_type {
enum rspamd_log_pipe_type {
RSPAMD_LOG_PIPE_SYMBOLS = 0,
};
#define CONTROL_PATHLEN 400
struct rspamd_control_command {
enum rspamd_control_type type;
union {
@@ -61,7 +61,7 @@ struct rspamd_control_command {
guint unused;
} recompile;
struct {
gpointer cache_dir;
gchar cache_dir[CONTROL_PATHLEN];
gboolean forced;
} hs_loaded;
struct {
@@ -112,6 +112,7 @@ struct rspamd_control_reply {
};

#define PAIR_ID_LEN 16

struct rspamd_srv_command {
enum rspamd_srv_type type;
guint64 id;
@@ -122,7 +123,7 @@ struct rspamd_srv_command {
guint pair_num;
} spair;
struct {
gpointer cache_dir;
gchar cache_dir[CONTROL_PATHLEN];
gboolean forced;
} hs_loaded;
struct {

Loading…
Cancel
Save