summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert James Kaes <rjkaes@users.sourceforge.net>2002-04-18 17:04:04 +0000
committerRobert James Kaes <rjkaes@users.sourceforge.net>2002-04-18 17:04:04 +0000
commit43860d24694823430b931e66c77a4b1b6e392037 (patch)
tree6033f155f84680159c068154d535c54f7a844470 /src
parent5822ec3d44aa6ad2261d9e3ce07d589a7e6a3dcb (diff)
downloadtinyproxy-43860d24694823430b931e66c77a4b1b6e392037.tar.gz
tinyproxy-43860d24694823430b931e66c77a4b1b6e392037.zip
Moved the filter_destroy() logic from inside the signal handler. It's now
been moved to inside the main() function.
Diffstat (limited to 'src')
-rw-r--r--src/tinyproxy.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tinyproxy.c b/src/tinyproxy.c
index c9966dd..7968d76 100644
--- a/src/tinyproxy.c
+++ b/src/tinyproxy.c
@@ -1,4 +1,4 @@
-/* $Id: tinyproxy.c,v 1.25 2002-04-18 16:57:06 rjkaes Exp $
+/* $Id: tinyproxy.c,v 1.26 2002-04-18 17:04:04 rjkaes Exp $
*
* The initialise routine. Basically sets up all the initial stuff (logfile,
* listening socket, config options, etc.) and then sits there and loops
@@ -58,12 +58,7 @@ takesig(int sig)
break;
case SIGTERM:
-#ifdef FILTER_ENABLE
- if (config.filter)
- filter_destroy();
-#endif /* FILTER_ENABLE */
config.quit = TRUE;
- log_message(LOG_INFO, "SIGTERM received.");
break;
}
@@ -383,6 +378,11 @@ main(int argc, char **argv)
thread_main_loop();
+#ifdef FILTER_ENABLE
+ if (config.filter)
+ filter_destroy();
+#endif
+
log_message(LOG_INFO, "Shutting down.");
thread_kill_threads();