]> source.dussan.org Git - rspamd.git/commitdiff
[Fix] Remove incorrect method `task:set_metric_subject`
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 5 Sep 2017 18:29:32 +0000 (19:29 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 5 Sep 2017 18:34:36 +0000 (19:34 +0100)
src/libserver/cfg_file.h
src/lua/lua_task.c

index d96c6e474605fb664529261b1672cfff23f461f4..48f352f499c9ee792c1c21b4e875060558cf450a 100644 (file)
@@ -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                                         */
 };
index 9d139044fc8a6c6d3b90ea6bc48dc96a0cc297f9..2f5883563dc26d394ce1cee51626618f3446c871 100644 (file)
@@ -586,12 +586,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)
@@ -886,7 +880,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),
@@ -4075,27 +4068,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)
 {