diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/tinyproxy.c | 12 |
2 files changed, 10 insertions, 6 deletions
@@ -1,5 +1,9 @@ 2002-04-18 Robert James Kaes <rjkaes@flarenet.com> + * src/tinyproxy.c (takesig): Moved the filter_destroy() code out + of the signal handler and placed it inside of main(). Same + reasoning as the rotate_log_files() changes below. + * src/utils.c (rotate_log_files): Moved the log rotation code out of the signal handler and into it's own function. Also improved the robustness of the code. Credit to Petr Lampa for suggesting 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(); |