From c56a0ad8bcfc3e8aa1f5980696f2b41de06225e1 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sun, 26 Feb 2012 12:41:00 +0100 Subject: [PATCH] Networker: watch out for server shutting down before doing DB-io tasks --- citadel/modules/network/serv_network.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index b32535ccb..dc61feb47 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -542,8 +542,10 @@ void network_do_queue(void) { /* * Load the network map and filter list into memory. */ - the_netmap = read_network_map(); - load_network_filter_list(); + if (!server_shutting_down) + the_netmap = read_network_map(); + if (!server_shutting_down) + load_network_filter_list(); /* * Go ahead and run the queue @@ -553,7 +555,7 @@ void network_do_queue(void) { CtdlForEachRoom(network_queue_interesting_rooms, &RL); } - if (RL.rplist != NULL) { + if ((RL.rplist != NULL) && (!server_shutting_down)) { RoomProcList *ptr, *cmp; ptr = RL.rplist; syslog(LOG_DEBUG, "network: running outbound queue\n"); -- 2.30.2