Adopt LUA API.

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index 36f10044916aed0ee12478e25027fa4ba0d8316d..726af2cb18ed4f97b1d079acaf2bf5f18b43f573 100644 (file)
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -71,7 +71,7 @@ LUA_FUNCTION_DEF (task, create_empty);
 LUA_FUNCTION_DEF (task, create_from_buffer);
 /* Task methods */
 LUA_FUNCTION_DEF (task, get_message);
-LUA_FUNCTION_DEF (task, rspamd_message_parse);
+LUA_FUNCTION_DEF (task, process_message);
 /***
  * @method task:get_cfg()
  * Get configuration object for a task.
@@ -474,7 +474,7 @@ static const struct luaL_reg tasklib_f[] = {
 static const struct luaL_reg tasklib_m[] = {
        LUA_INTERFACE_DEF (task, get_message),
        LUA_INTERFACE_DEF (task, destroy),
-       LUA_INTERFACE_DEF (task, rspamd_message_parse),
+       LUA_INTERFACE_DEF (task, process_message),
        LUA_INTERFACE_DEF (task, set_cfg),
        LUA_INTERFACE_DEF (task, get_cfg),
        LUA_INTERFACE_DEF (task, get_mempool),

diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
index ac0c5f18a0fb9d4a16c6a5a96973908a7fcbea84..3e6b34c810b63c60483c200e4c78eec2d9dbe0e0 100644 (file)
--- a/src/lua/lua_util.c
+++ b/src/lua/lua_util.c
@@ -195,24 +195,29 @@ lua_util_process_message (lua_State *L)
                task->s = rspamd_session_create (task->task_pool, rspamd_task_fin,
                                        rspamd_task_restore, rspamd_task_free_hard, task);
 
-               if (rspamd_task_process (task, NULL, message, mlen, TRUE)) {
-                       event_base_loop (base, 0);
+               if (!rspamd_task_load_message (task, NULL, message, mlen)) {
+                       lua_pushnil (L);
+               }
+               else {
+                       if (rspamd_task_process (task, RSPAMD_TASK_PROCESS_ALL)) {
+                               event_base_loop (base, 0);
 
-                       if (res != NULL) {
-                               ucl_object_push_lua (L, res, true);
+                               if (res != NULL) {
+                                       ucl_object_push_lua (L, res, true);
 
-                               ucl_object_unref (res);
+                                       ucl_object_unref (res);
+                               }
+                               else {
+                                       ucl_object_push_lua (L, rspamd_protocol_write_ucl (task, NULL),
+                                                       true);
+                                       rdns_resolver_release (task->resolver->r);
+                                       rspamd_task_free_hard (task);
+                               }
                        }
                        else {
-                               ucl_object_push_lua (L, rspamd_protocol_write_ucl (task, NULL),
-                                               true);
-                               rdns_resolver_release (task->resolver->r);
-                               rspamd_task_free_hard (task);
+                               lua_pushnil (L);
                        }
                }
-               else {
-                       lua_pushnil (L);
-               }
 
                event_base_free (base);
        }