X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fexpire%2Fserv_expire.c;h=7fd28e6b4a699217d90d094fc8f8ee6ac9866ee1;hb=dbee11a35d5d217f356279fa400d7f9deab86cb0;hp=cf501e081615b06a425e8ace4906dbfdc00a9298;hpb=d001966c9912514514456181b3034de7ec2772c1;p=citadel.git

diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index cf501e081..7fd28e6b4 100644
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -3,7 +3,7 @@
  *
  * You might also see this module affectionately referred to as the DAP (the Dreaded Auto-Purger).
  *
- * Copyright (c) 1988-2015 by citadel.org (Art Cancro, Wilifried Goesgens, and others)
+ * Copyright (c) 1988-2017 by citadel.org (Art Cancro, Wilifried Goesgens, and others)
  *
  * This program is open source software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as published
@@ -102,7 +102,6 @@ struct ValidUser {
 	long vu_usernum;
 };
 
-
 struct ctdlroomref {
 	struct ctdlroomref *next;
 	long msgnum;
@@ -176,7 +175,6 @@ void GatherPurgeMessages(struct ctdlroom *qrbuf, void *data) {
 		return;
 	}
 
-
 	/* If the room is set to expire by count, do that */
 	if (epbuf.expire_mode == EXPIRE_NUMMSGS) {
 		if (num_msgs > epbuf.expire_value) {
@@ -192,7 +190,7 @@ void GatherPurgeMessages(struct ctdlroom *qrbuf, void *data) {
 		for (a=0; a<num_msgs; ++a) {
 			delnum = msglist[a];
 
-			msg = CtdlFetchMessage(delnum, 0); /* dont need body */
+			msg = CtdlFetchMessage(delnum, 0, 1); /* dont need body */
 			if (msg != NULL) {
 				xtime = atol(msg->cm_fields[eTimestamp]);
 				CM_Free(msg);
@@ -327,7 +325,6 @@ void DoPurgeRooms(struct ctdlroom *qrbuf, void *data) {
 }
 
 
-
 int PurgeRooms(void) {
 	struct PurgeList *pptr;
 	int num_rooms_purged = 0;
@@ -337,7 +334,6 @@ int PurgeRooms(void) {
 
 	syslog(LOG_DEBUG, "PurgeRooms() called");
 
-
 	/* Load up a table full of valid user numbers so we can delete
 	 * user-owned rooms for users who no longer exist */
 	ForEachUser(AddValidUser, NULL);
@@ -352,7 +348,6 @@ int PurgeRooms(void) {
 		ValidUserList = vuptr;
 	}
 
-
 	transcript = malloc(SIZ);
 	strcpy(transcript, "The following rooms have been auto-purged:\n");
 
@@ -399,8 +394,6 @@ void do_uid_user_purge(struct ctdluser *us, void *data) {
 }
 
 
-
-
 /*
  * Back end function to check user accounts for expiration.
  */
@@ -514,7 +507,6 @@ void do_user_purge(struct ctdluser *us, void *data) {
 }
 
 
-
 int PurgeUsers(void) {
 	struct PurgeList *pptr;
 	int num_users_purged = 0;
@@ -684,6 +676,7 @@ int PurgeVisits(void) {
 	return(purged);
 }
 
+
 /*
  * Purge the use table of old entries.
  *
@@ -696,32 +689,25 @@ int PurgeUseTable(StrBuf *ErrMsg) {
 	struct UPurgeList *uptr; 
 
 	/* Phase 1: traverse through the table, discovering old records... */
-	if (CheckTDAPVeto(CDB_USETABLE, ErrMsg))
-	{
-		syslog(LOG_DEBUG, "Purge use table: VETO!");
-		return 0;
-	}
 
 	syslog(LOG_DEBUG, "Purge use table: phase 1");
 	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
-		 */
+	while(cdbut = cdb_next_item(CDB_USETABLE), cdbut != NULL)
+	{
 		if (cdbut->len > sizeof(struct UseTable))
 			memcpy(&ut, cdbut->ptr, sizeof(struct UseTable));
-		else {
+		else
+		{
 			memset(&ut, 0, sizeof(struct UseTable));
 			memcpy(&ut, cdbut->ptr, cdbut->len);
 		}
 		cdb_free(cdbut);
 
-		if ( (time(NULL) - ut.ut_timestamp) > USETABLE_RETAIN ) {
+		if ( (time(NULL) - ut.ut_timestamp) > USETABLE_RETAIN )
+		{
 			uptr = (struct UPurgeList *) malloc(sizeof(struct UPurgeList));
-			if (uptr != NULL) {
+			if (uptr != NULL)
+			{
 				uptr->next = ul;
 				safestrncpy(uptr->up_key, ut.ut_msgid, sizeof uptr->up_key);
 				ul = uptr;
@@ -745,7 +731,6 @@ int PurgeUseTable(StrBuf *ErrMsg) {
 }
 
 
-
 /*
  * Purge the EUID Index of old records.
  *
@@ -765,7 +750,7 @@ int PurgeEuidIndexTable(void) {
 
 		memcpy(&msgnum, cdbei->ptr, sizeof(long));
 
-		msg = CtdlFetchMessage(msgnum, 0);
+		msg = CtdlFetchMessage(msgnum, 0, 1);
 		if (msg != NULL) {
 			CM_Free(msg);	/* it still exists, so do nothing */
 		}
@@ -800,7 +785,6 @@ int PurgeEuidIndexTable(void) {
 }
 
 
-
 /*
  * Purge OpenID assocations for missing users (theoretically this will never delete anything)
  */
@@ -848,9 +832,6 @@ int PurgeStaleOpenIDassociations(void) {
 }
 
 
-
-
-
 void purge_databases(void)
 {
 	int retval;
@@ -924,6 +905,13 @@ void purge_databases(void)
 	       	syslog(LOG_NOTICE, "Processed %d message reference count adjustments.", retval);
 	}
 
+	// Enable this after we've tested it and make it a site-configurable option.
+	// This will allow the database files to shrink when they can.
+	// if (!server_shutting_down)
+	// {
+		// cdb_compact();
+	// }
+
 	if (!server_shutting_down)
 	{
 	       	syslog(LOG_INFO, "Auto-purger: finished.");
@@ -946,7 +934,6 @@ void cmd_tdap(char *argbuf) {
 }
 
 
-
 CTDL_MODULE_INIT(expire)
 {
 	if (!threading)