]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Lua_task: Add compatibility knobs for set_pre_result
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Wed, 23 Jan 2019 14:27:11 +0000 (14:27 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Wed, 23 Jan 2019 14:27:11 +0000 (14:27 +0000)
src/lua/lua_task.c

index e8746f2bdc70a8fd4ccafabbeb7ba691ffdb79de..2606478d15bc430b52da8ae8a23c46a2e78a8921 100644 (file)
@@ -1666,7 +1666,19 @@ lua_task_set_pre_result (lua_State * L)
                }
 
                if (lua_type (L, 2) == LUA_TSTRING) {
-                       action = rspamd_config_get_action (task->cfg, lua_tostring (L, 2));
+                       const gchar *act_name = lua_tostring (L, 2);
+                       gint internal_type;
+
+                       if (strcmp (act_name, "accept") == 0) {
+                               /* Compatibility! */
+                               act_name = "no action";
+                       }
+                       else if (rspamd_action_from_str (act_name, &internal_type)) {
+                               /* Compatibility! */
+                               act_name = rspamd_action_to_str (internal_type);
+                       }
+
+                       action = rspamd_config_get_action (task->cfg, act_name);
                }
                else {
                        return luaL_error (L, "invalid arguments");
@@ -1676,7 +1688,8 @@ lua_task_set_pre_result (lua_State * L)
                        struct rspamd_action *tmp;
 
                        HASH_ITER (hh, task->cfg->actions, action, tmp) {
-                               msg_err ("known action: %s = %f", action->name, action->threshold);
+                               msg_err_task ("known defined action: %s = %f",
+                                               action->name, action->threshold);
                        }
 
                        return luaL_error (L, "unknown action %s", lua_tostring (L, 2));