From fc9abf092a4fc6605c86f61e7d72420aceb1ba3e Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 5 Sep 2017 19:29:32 +0100 Subject: [PATCH] [Fix] Remove incorrect method `task:set_metric_subject` --- src/libserver/cfg_file.h | 2 +- src/lua/lua_task.c | 28 ---------------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h index 45202f5ab..c57640162 100644 --- a/src/libserver/cfg_file.h +++ b/src/libserver/cfg_file.h @@ -269,7 +269,7 @@ struct rspamd_metric { gdouble unknown_weight; /**< weight of unknown symbols */ gdouble grow_factor; /**< grow factor for metric */ GHashTable *symbols; /**< weights of symbols in metric */ - gchar *subject; /**< subject rewrite string */ + const gchar *subject; /**< subject rewrite string */ GHashTable * groups; /**< groups of symbols */ struct metric_action actions[METRIC_ACTION_MAX]; /**< all actions of the metric */ }; diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c index de5e57e7e..4c9c23a75 100644 --- a/src/lua/lua_task.c +++ b/src/lua/lua_task.c @@ -561,12 +561,6 @@ LUA_FUNCTION_DEF (task, set_metric_score); * @param {string} action name to set */ LUA_FUNCTION_DEF (task, set_metric_action); -/*** - * @method task:set_metric_subject(subject) - * Set the subject in the default metric - * @param {string} subject subject to set - */ -LUA_FUNCTION_DEF (task, set_metric_subject); /*** * @method task:learn(is_spam[, classifier) @@ -858,7 +852,6 @@ static const struct luaL_reg tasklib_m[] = { LUA_INTERFACE_DEF (task, get_metric_action), LUA_INTERFACE_DEF (task, set_metric_score), LUA_INTERFACE_DEF (task, set_metric_action), - LUA_INTERFACE_DEF (task, set_metric_subject), LUA_INTERFACE_DEF (task, learn), LUA_INTERFACE_DEF (task, set_settings), LUA_INTERFACE_DEF (task, get_settings), @@ -3928,27 +3921,6 @@ lua_task_set_metric_action (lua_State *L) return 1; } -static gint -lua_task_set_metric_subject (lua_State *L) -{ - struct rspamd_task *task = lua_check_task (L, 1); - const gchar *subject; - struct rspamd_metric *metric; - - metric = task->cfg->default_metric; - subject = luaL_checkstring (L, 2); - - if (task && metric && subject) { - metric->subject = rspamd_mempool_strdup (task->task_pool, subject); - lua_pushboolean (L, true); - } - else { - return luaL_error (L, "invalid arguments"); - } - - return 1; -} - static gint lua_task_get_protocol_reply (lua_State *L) { -- 2.39.5