From 1a23a3f918ac45904895b6d293eb2e26babe713e Mon Sep 17 00:00:00 2001 From: Dave West Date: Mon, 20 Aug 2007 22:30:41 +0000 Subject: [PATCH] destroy_network_queue_room() is now called via the cleanup hook mechanism. Added a comment about how to proceed with modules stuff. --- citadel/citserver.c | 4 ++-- citadel/modules/expire/serv_expire.c | 5 +++++ citadel/modules/network/serv_network.c | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/citadel/citserver.c b/citadel/citserver.c index 46f3834f0..87f4f6f82 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -57,7 +57,7 @@ #include "control.h" #include "tools.h" #include "euidindex.h" -#include "serv_network.h" /* Needed for destroy_network_queue_room called from master_cleanup */ +/*#include "serv_network.h"*/ /* Needed for destroy_network_queue_room called from master_cleanup */ #ifndef HAVE_SNPRINTF #include "snprintf.h" @@ -176,7 +176,7 @@ void master_cleanup(int exitcode) { close_databases(); /* flush the networker stuff */ - destroy_network_queue_room(); +/* destroy_network_queue_room();*/ /* Do system-dependent stuff */ sysdep_master_cleanup(); diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c index d6f2c9b6f..ee41a5f84 100644 --- a/citadel/modules/expire/serv_expire.c +++ b/citadel/modules/expire/serv_expire.c @@ -622,6 +622,11 @@ int PurgeUseTable(void) { cdb_rewind(CDB_USETABLE); while(cdbut = cdb_next_item(CDB_USETABLE), cdbut != NULL) { + /* + * TODODRW: change this to create a new function time_t cdb_get_timestamp( struct cdbdata *) + * this will release this file from the serv_network.h + * Maybe it could be a macro that extracts and casts the reult + */ memcpy(&ut, cdbut->ptr, ((cdbut->len > sizeof(struct UseTable)) ? sizeof(struct UseTable) : cdbut->len)); diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index d2ffaed84..8ceba0d11 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -2077,6 +2077,8 @@ CTDL_MODULE_INIT(network) CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node"); CtdlRegisterSessionHook(network_do_queue, EVT_TIMER); CtdlRegisterRoomHook(network_room_handler); + CtdlRegisterCleanupHook(destroy_network_queue_room); + /* return our Subversion id for the Log */ return "$Id$"; -- 2.30.2