X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fpop3client%2Fserv_pop3client.c;h=51d3f2dd9599ef9eabbf64a9718784b99faf8f3c;hb=c71df26b9d35c07eb9c1322a7e83caa86337ad82;hp=63f709e16815c809cc0aabeb6581c1125c79809b;hpb=321595f551d9e009f54b564b8459a293fe431fc4;p=citadel.git

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index 63f709e16..51d3f2dd9 100644
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -1,7 +1,7 @@
 /*
  * Consolidate mail from remote POP3 accounts.
  *
- * Copyright (c) 2007-2017 by the citadel.org team
+ * Copyright (c) 2007-2019 by the citadel.org team
  *
  * 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
@@ -59,7 +59,6 @@ struct p3cq {				// module-local queue of pop3 client work that needs processing
 	long interval;
 };
 
-struct CitContext pop3_client_CC;
 static int doing_pop3client = 0;
 struct p3cq *p3cq = NULL;
 
@@ -99,7 +98,7 @@ void pop3client_one_mailbox(char *room, const char *host, const char *user, cons
 	res = curl_easy_perform(curl);
 	if (res == CURLE_OK) {
 	} else {
-		syslog(LOG_DEBUG, "POP3S client failed: %s , trying POP3 next", curl_easy_strerror(res));
+		syslog(LOG_DEBUG, "pop3client: POP3S connection failed: %s , trying POP3 next", curl_easy_strerror(res));
 		snprintf(url, sizeof url, "pop3://%s", host);			// try unencrypted next
 		curl_easy_setopt(curl, CURLOPT_URL, url);
 		FlushStrBuf(Uidls);
@@ -107,7 +106,7 @@ void pop3client_one_mailbox(char *room, const char *host, const char *user, cons
 	}
 
 	if (res != CURLE_OK) {
-		syslog(LOG_DEBUG, "pop3 client failed: %s", curl_easy_strerror(res));
+		syslog(LOG_DEBUG, "pop3client: POP3 connection failed: %s", curl_easy_strerror(res));
 		curl_easy_cleanup(curl);
 		FreeStrBuf(&Uidls);
 		return;
@@ -117,7 +116,7 @@ void pop3client_one_mailbox(char *room, const char *host, const char *user, cons
 	// Now go through the UIDL list and look for messages.
 
 	int num_msgs = num_tokens(ChrPtr(Uidls), '\n');
-	syslog(LOG_DEBUG, "There are %d messages.", num_msgs);
+	syslog(LOG_DEBUG, "pop3client: there are %d messages", num_msgs);
 	for (i=0; i<num_msgs; ++i) {
 		char oneuidl[1024];
 		extract_token(oneuidl, ChrPtr(Uidls), i, '\n', sizeof oneuidl);
@@ -159,7 +158,7 @@ void pop3client_one_mailbox(char *room, const char *host, const char *user, cons
 				}
 			}
 			else {
-				syslog(LOG_DEBUG, "%s has already been retrieved", oneuidl);
+				syslog(LOG_DEBUG, "pop3client: %s has already been retrieved", oneuidl);
 			}
 		}
 	}
@@ -204,8 +203,6 @@ void pop3client_scan(void) {
 	time_t fastest_scan;
 	struct p3cq *pptr = NULL;
 
-	become_session(&pop3_client_CC);
-
 	if (CtdlGetConfigLong("c_pop3_fastest") < CtdlGetConfigLong("c_pop3_fetch")) {
 		fastest_scan = CtdlGetConfigLong("c_pop3_fastest");
 	}
@@ -229,13 +226,13 @@ void pop3client_scan(void) {
 	if (doing_pop3client) return;
 	doing_pop3client = 1;
 
-	syslog(LOG_DEBUG, "pop3client scan started");
+	syslog(LOG_DEBUG, "pop3client: scan started");
 	CtdlForEachNetCfgRoom(pop3client_scan_room, NULL);
 
 	/*
 	 * We have to queue and process in separate phases, otherwise we leave a cursor open
 	 */
-	syslog(LOG_DEBUG, "pop3client processing started");
+	syslog(LOG_DEBUG, "pop3client: processing started");
 	while (p3cq != NULL) {
 		pptr = p3cq;
 		p3cq = p3cq->next;
@@ -249,7 +246,7 @@ void pop3client_scan(void) {
 		free(pptr);
 	}
 
-	syslog(LOG_DEBUG, "pop3client ended");
+	syslog(LOG_DEBUG, "pop3client: ended");
 	last_run = time(NULL);
 	doing_pop3client = 0;
 }
@@ -259,7 +256,6 @@ CTDL_MODULE_INIT(pop3client)
 {
 	if (!threading)
 	{
-		CtdlFillSystemContext(&pop3_client_CC, "POP3aggr");
 		CtdlREGISTERRoomCfgType(pop3client, ParseGeneric, 0, 5, SerializeGeneric, DeleteGenericCfgLine);
 		CtdlRegisterSessionHook(pop3client_scan, EVT_TIMER, PRIO_AGGR + 50);
 	}