Refactor events API.

5 files changed, 12 insertions, 12 deletions

diff --git a/src/lua/lua_http.c b/src/lua/lua_http.c
index 1baef5ed4..cec631402 100644
--- a/src/lua/lua_http.c
+++ b/src/lua/lua_http.c
@@ -122,7 +122,7 @@ static void
 lua_http_maybe_free (struct lua_http_cbdata *cbd)
 {
 	if (cbd->session) {
-		remove_normal_event (cbd->session, lua_http_fin, cbd);
+		rspamd_session_remove_event (cbd->session, lua_http_fin, cbd);
 	}
 	else {
 		lua_http_fin (cbd);
@@ -438,7 +438,7 @@ lua_http_request (lua_State *L)
 	cbd->fd = -1;
 	if (session) {
 		cbd->session = session;
-		register_async_event (session,
+		rspamd_session_add_event (session,
 				(event_finalizer_t)lua_http_fin,
 				cbd,
 				g_quark_from_static_string ("lua http"));
diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c
index 9cf10bb10..66a8c6cac 100644
--- a/src/lua/lua_redis.c
+++ b/src/lua/lua_redis.c
@@ -137,7 +137,7 @@ lua_redis_push_error (const gchar *err,
 	}
 
 	if (connected) {
-		remove_normal_event (ud->task->s, lua_redis_fin, ud);
+		rspamd_session_remove_event (ud->task->s, lua_redis_fin, ud);
 	}
 }
 
@@ -196,7 +196,7 @@ lua_redis_push_data (const redisReply *r, struct lua_redis_userdata *ud)
 		msg_info ("call to callback failed: %s", lua_tostring (ud->L, -1));
 	}
 
-	remove_normal_event (ud->task->s, lua_redis_fin, ud);
+	rspamd_session_remove_event (ud->task->s, lua_redis_fin, ud);
 }
 
 /**
@@ -441,7 +441,7 @@ lua_redis_make_request (lua_State *L)
 					(const gchar **)ud->args,
 					NULL);
 		if (ret == REDIS_OK) {
-			register_async_event (ud->task->s,
+			rspamd_session_add_event (ud->task->s,
 					lua_redis_fin,
 					ud,
 					g_quark_from_static_string ("lua redis"));
diff --git a/src/lua/lua_session.c b/src/lua/lua_session.c
index ccb8fd7b4..478d74b75 100644
--- a/src/lua/lua_session.c
+++ b/src/lua/lua_session.c
@@ -190,7 +190,7 @@ lua_session_create (lua_State *L)
 		}
 	}
 
-	session = new_async_session (mempool,
+	session = rspamd_session_create (mempool,
 			lua_session_finalizer,
 			lua_session_restore,
 			lua_session_cleanup,
@@ -211,7 +211,7 @@ lua_session_delete (lua_State *L)
 
 	session = cbd->session;
 	if (session) {
-		destroy_session (session);
+		rspamd_session_destroy (session);
 		return 0;
 	}
 	else {
@@ -256,7 +256,7 @@ lua_session_register_async_event (lua_State *L)
 			lua_pushvalue (L, 1);
 			cbdata->cbref = luaL_ref (L, LUA_REGISTRYINDEX);
 			cbdata->session = session;
-			register_async_event (session,
+			rspamd_session_add_event (session,
 				lua_event_fin,
 				cbdata,
 				g_quark_from_static_string ("lua event"));
@@ -285,7 +285,7 @@ lua_session_remove_normal_event (lua_State *L)
 	if (session) {
 		data = lua_check_event (L, 2);
 		if (data) {
-			remove_normal_event (session, lua_event_fin, data);
+			rspamd_session_remove_event (session, lua_event_fin, data);
 			return 0;
 		}
 	}
diff --git a/src/lua/lua_tcp.c b/src/lua/lua_tcp.c
index 4cff7d0cc..fadb7d93b 100644
--- a/src/lua/lua_tcp.c
+++ b/src/lua/lua_tcp.c
@@ -120,7 +120,7 @@ static void
 lua_tcp_maybe_free (struct lua_tcp_cbdata *cbd)
 {
 	if (cbd->session) {
-		remove_normal_event (cbd->session, lua_tcp_fin, cbd);
+		rspamd_session_remove_event (cbd->session, lua_tcp_fin, cbd);
 	}
 	else {
 		lua_tcp_fin (cbd);
@@ -593,7 +593,7 @@ lua_tcp_request (lua_State *L)
 
 	if (session) {
 		cbd->session = session;
-		register_async_event (session,
+		rspamd_session_add_event (session,
 				(event_finalizer_t)lua_tcp_fin,
 				cbd,
 				g_quark_from_static_string ("lua tcp"));
diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
index 4442a3161..d93811dae 100644
--- a/src/lua/lua_util.c
+++ b/src/lua/lua_util.c
@@ -190,7 +190,7 @@ lua_util_process_message (lua_State *L)
 		task->fin_callback = lua_util_task_fin;
 		task->fin_arg = &res;
 		task->resolver = dns_resolver_init (NULL, base, cfg);
-		task->s = new_async_session (task->task_pool, rspamd_task_fin,
+		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)) {