[Fix] Cleanup session on exit

diff --git a/src/rspamadm/lua_repl.c b/src/rspamadm/lua_repl.c
index bc1291a2148824c9025a471cba93c0f482616009..432c4de76e7e816ad1b77797e2d2dab2472c5987 100644 (file)
--- a/src/rspamadm/lua_repl.c
+++ b/src/rspamadm/lua_repl.c
@@ -1,11 +1,11 @@
-/*-
- * Copyright 2016 Vsevolod Stakhov
+/*
+ * Copyright 2023 Vsevolod Stakhov
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -288,6 +288,8 @@ wait_session_events(void)
        while (rspamd_session_events_pending(rspamadm_session) > 0) {
                ev_loop(rspamd_main->event_loop, EVRUN_ONCE);
        }
+
+       msg_debug("finished events waiting, terminating session");
 }
 
 gint lua_repl_thread_call(struct thread_entry *thread, gint narg, gpointer ud, lua_thread_error_t error_func)

diff --git a/src/rspamadm/rspamadm.c b/src/rspamadm/rspamadm.c
index 22a875c1e5d4ed4c2f31ce2a4f94cf58dafff444..58f2da3088da6a7b988f1ea8e20f34286f676970 100644 (file)
--- a/src/rspamadm/rspamadm.c
+++ b/src/rspamadm/rspamadm.c
@@ -1,11 +1,11 @@
-/*-
- * Copyright 2016 Vsevolod Stakhov
+/*
+ * Copyright 2023 Vsevolod Stakhov
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -604,6 +604,7 @@ gint main(gint argc, gchar **argv, gchar **env)
        ev_break(rspamd_main->event_loop, EVBREAK_ALL);
 
 end:
+       rspamd_session_destroy(rspamadm_session);
        g_option_context_free(context);
        rspamd_dns_resolver_deinit(resolver);
        REF_RELEASE(rspamd_main->cfg);