Updated more modules to the new logging standard

diff --git a/citadel/modules/fulltext/ft_wordbreaker.c b/citadel/modules/fulltext/ft_wordbreaker.c
index 3c61697c8ce9f07f229537802fe2c69c7ab78d78..b2ba828bb8406a77e8ec28b66c2d7e0eceb2f319 100644 (file)
--- a/citadel/modules/fulltext/ft_wordbreaker.c
+++ b/citadel/modules/fulltext/ft_wordbreaker.c
@@ -1,24 +1,17 @@
 /*
  * Default wordbreaker module for full text indexing.
  *
- * Copyright (c) 2005-2012 by the citadel.org team
+ * Copyright (c) 2005-2017 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 version 3.
- *  
- *  
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  
- *  
- *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
-
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -159,7 +152,7 @@ void noise_word_cleanup(void)
        int i;
        noise_word *cur, *next;
        
-       syslog(LOG_INFO, "Cleaning up fulltext noise words.\n");
+       syslog(LOG_INFO, "wordbreaker: cleaning up fulltext noise words");
        
        for (i = 0 ; i < 26 ; i++)
        {
@@ -231,12 +224,11 @@ void wordbreaker(const char *text, int *num_tokens, int **tokens) {
                ch = *ptr;
                if ( (!isalnum(ch)) && (word_start) ) {
                        word_end = ptr;
-//                     --word_end;
 
                        /* extract the word */
                        word_len = word_end - word_start;
                        if (word_len >= sizeof word) {
-                               syslog(LOG_DEBUG, "Invalid word length: %d\n", word_len);
+                               syslog(LOG_DEBUG, "wordbreaker: invalid word length: %d", word_len);
                                safestrncpy(word, word_start, sizeof word);
                                word[(sizeof word) - 1] = 0;
                        }

diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c
index 3709ef6319398c3515143af9871a7e473e9fcdfc..522c3824a7d08269dfc98fb199ea09c611a5c191 100644 (file)
--- a/citadel/modules/fulltext/serv_fulltext.c
+++ b/citadel/modules/fulltext/serv_fulltext.c
@@ -1,6 +1,6 @@
 /*
  * This module handles fulltext indexing of the message base.
- * Copyright (c) 2005-2015 by the citadel.org team
+ * Copyright (c) 2005-2017 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
@@ -90,7 +90,7 @@ void ft_flush_cache(void) {
        for (i=0; i<65536; ++i) {
                if ((time(NULL) - last_update) >= 10) {
                        syslog(LOG_INFO,
-                               "Flushing index cache to disk (%d%% complete)",
+                               "fulltext: flushing index cache to disk (%d%% complete)",
                                (i * 100 / 65536)
                        );
                        last_update = time(NULL);
@@ -103,7 +103,7 @@ void ft_flush_cache(void) {
                        ftc_msgs[i] = NULL;
                }
        }
-       syslog(LOG_INFO, "Flushed index cache to disk (100%% complete)");
+       syslog(LOG_INFO, "fulltext: flushed index cache to disk (100%% complete)");
 }
 
 
@@ -122,17 +122,17 @@ void ft_index_message(long msgnum, int op) {
 
        msg = CtdlFetchMessage(msgnum, 1, 1);
        if (msg == NULL) {
-               syslog(LOG_ERR, "ft_index_message() could not load msg %ld", msgnum);
+               syslog(LOG_ERR, "fulltext: ft_index_message() could not load msg %ld", msgnum);
                return;
        }
 
        if (!CM_IsEmpty(msg, eSuppressIdx)) {
-               syslog(LOG_DEBUG, "ft_index_message() excluded msg %ld", msgnum);
+               syslog(LOG_DEBUG, "fulltext: ft_index_message() excluded msg %ld", msgnum);
                CM_Free(msg);
                return;
        }
 
-       syslog(LOG_DEBUG, "ft_index_message() %s msg %ld", (op ? "adding" : "removing") , msgnum);
+       syslog(LOG_DEBUG, "fulltext: ft_index_message() %s msg %ld", (op ? "adding" : "removing") , msgnum);
 
        /* Output the message as text before indexing it, so we don't end up
         * indexing a bunch of encoded base64, etc.
@@ -143,13 +143,13 @@ void ft_index_message(long msgnum, int op) {
        msgtext = CC->redirect_buffer;
        CC->redirect_buffer = NULL;
        if (msgtext != NULL) {
-               syslog(LOG_DEBUG, "Wordbreaking message %ld (%d bytes)", msgnum, StrLength(msgtext));
+               syslog(LOG_DEBUG, "fulltext: wordbreaking message %ld (%d bytes)", msgnum, StrLength(msgtext));
        }
        txt = SmashStrBuf(&msgtext);
        wordbreaker(txt, &num_tokens, &tokens);
        free(txt);
 
-       syslog(LOG_DEBUG, "Indexing message %ld [%d tokens]", msgnum, num_tokens);
+       syslog(LOG_DEBUG, "fulltext: indexing message %ld [%d tokens]", msgnum, num_tokens);
        if (num_tokens > 0) {
                for (i=0; i<num_tokens; ++i) {
 
@@ -195,7 +195,7 @@ void ft_index_message(long msgnum, int op) {
                                }
                        }
                        else {
-                               syslog(LOG_ALERT, "Invalid token %d !!", tok);
+                               syslog(LOG_ALERT, "fulltext: invalid token %d !!", tok);
                        }
                }
 
@@ -242,8 +242,6 @@ void do_fulltext_indexing(void) {
        int i;
        static time_t last_index = 0L;
        static time_t last_progress = 0L;
-       time_t run_time = 0L;
-       time_t end_time = 0L;
        static int is_running = 0;
        if (is_running) return;         /* Concurrency check - only one can run */
        is_running = 1;
@@ -259,7 +257,6 @@ void do_fulltext_indexing(void) {
         * Make sure we don't run the indexer too frequently.
         * FIXME move the setting into config
         */
- 
        if ( (time(NULL) - last_index) < 300L) {
                return;
        }
@@ -275,19 +272,16 @@ void do_fulltext_indexing(void) {
                return;         /* nothing to do! */
        }
        
-       run_time = time(NULL);
-       syslog(LOG_DEBUG, "do_fulltext_indexing() started (%ld)", run_time);
-       
        /*
         * If we've switched wordbreaker modules, burn the index and start
         * over.
         */
        begin_critical_section(S_CONTROL);
        if (CtdlGetConfigInt("MM_fulltext_wordbreaker") != FT_WORDBREAKER_ID) {
-               syslog(LOG_DEBUG, "wb ver on disk = %d, code ver = %d",
+               syslog(LOG_DEBUG, "fulltext: wb ver on disk = %d, code ver = %d",
                        CtdlGetConfigInt("MM_fulltext_wordbreaker"), FT_WORDBREAKER_ID
                );
-               syslog(LOG_INFO, "(re)initializing full text index");
+               syslog(LOG_INFO, "fulltext: (re)initializing index");
                cdb_trunc(CDB_FULLTEXT);
                CtdlSetConfigLong("MMfulltext", 0);
        }
@@ -314,7 +308,7 @@ void do_fulltext_indexing(void) {
                for (i=0; i<ft_num_msgs; ++i) {
                        if (time(NULL) != last_progress) {
                                syslog(LOG_DEBUG,
-                                       "Indexed %d of %d messages (%d%%)",
+                                       "fulltext: indexed %d of %d messages (%d%%)",
                                                i, ft_num_msgs,
                                                ((i*100) / ft_num_msgs)
                                );
@@ -324,14 +318,14 @@ void do_fulltext_indexing(void) {
 
                        /* Check to see if we need to quit early */
                        if (server_shutting_down) {
-                               syslog(LOG_DEBUG, "Indexer quitting early");
+                               syslog(LOG_DEBUG, "fulltext: indexer quitting early");
                                ft_newhighest = ft_newmsgs[i];
                                break;
                        }
 
                        /* Check to see if we have to maybe flush to disk */
                        if (i >= FT_MAX_CACHE) {
-                               syslog(LOG_DEBUG, "Time to flush.");
+                               syslog(LOG_DEBUG, "fulltext: time to flush.");
                                ft_newhighest = ft_newmsgs[i];
                                break;
                        }
@@ -343,15 +337,12 @@ void do_fulltext_indexing(void) {
                ft_num_alloc = 0;
                ft_newmsgs = NULL;
        }
-       end_time = time(NULL);
 
        if (server_shutting_down) {
                is_running = 0;
                return;
        }
        
-       syslog(LOG_DEBUG, "do_fulltext_indexing() duration (%ld)", end_time - run_time);
-               
        /* Save our place so we don't have to do this again */
        ft_flush_cache();
        begin_critical_section(S_CONTROL);
@@ -360,7 +351,7 @@ void do_fulltext_indexing(void) {
        end_critical_section(S_CONTROL);
        last_index = time(NULL);
 
-       syslog(LOG_DEBUG, "do_fulltext_indexing() finished");
+       syslog(LOG_DEBUG, "fulltext: indexing finished");
        is_running = 0;
        return;
 }

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index 63f709e16815c809cc0aabeb6581c1125c79809b..ab2c4a6cdc20c2e37d8c0c4193bbfea3ab8745ba 100644 (file)
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -99,7 +99,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 +107,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 +117,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 +159,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);
                        }
                }
        }
@@ -229,13 +229,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 +249,7 @@ void pop3client_scan(void) {
                free(pptr);
        }
 
-       syslog(LOG_DEBUG, "pop3client ended");
+       syslog(LOG_DEBUG, "pop3client: ended");
        last_run = time(NULL);
        doing_pop3client = 0;
 }

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 72ce11ed280f8164cdaa538ce73b0bf6994d7529..0b89a9563ac5c4f011321a8dbd82db4ceb0ef402 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -181,11 +181,11 @@ void rss_end_element(void *data, const char *el)
                                        else {
                                                CtdlSaveMsgPointerInRoom(rr->room, msgnum, 0, NULL);
                                        }
-                                       syslog(LOG_DEBUG, "Saved message %ld to %s", msgnum, rr->room);
+                                       syslog(LOG_DEBUG, "rssclient: saved message %ld to %s", msgnum, rr->room);
                                }
                        }
                        else {
-                               syslog(LOG_DEBUG, "%s was already seen", r->item_id);
+                               syslog(LOG_DEBUG, "rssclient: already seen %s", r->item_id);
                        }
        
                        CM_Free(r->msg);
@@ -310,7 +310,7 @@ void rssclient_push_todo(char *rssurl, char *roomname)
        struct rssurl *thisone = NULL;
        struct rssroom *newroom = NULL;
 
-       syslog(LOG_DEBUG, "rssclient_push_todo(%s, %s)", rssurl, roomname);
+       syslog(LOG_DEBUG, "rssclient: will fetch %s to %s", rssurl, roomname);
 
        for (r=rsstodo; r!=NULL; r=r->next) {
                if (!strcasecmp(r->url, rssurl)) {
@@ -340,7 +340,7 @@ void rss_pull_one_feed(struct rssurl *url)
        CURLcode res;
        StrBuf *Downloaded = NULL;
 
-       syslog(LOG_DEBUG, "rss_pull_one_feed(%s)", url->url);
+       syslog(LOG_DEBUG, "rssclient: fetching %s", url->url);
 
        curl = curl_easy_init();
        if (!curl) {
@@ -358,7 +358,7 @@ void rss_pull_one_feed(struct rssurl *url)
        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 20L);                           // Time out after 20 seconds
        res = curl_easy_perform(curl);                                          // Perform the request
        if (res != CURLE_OK) {
-               syslog(LOG_WARNING, "Failed to load feed: %s", curl_easy_strerror(res));
+               syslog(LOG_WARNING, "rssclient: failed to load feed: %s", curl_easy_strerror(res));
        }
        curl_easy_cleanup(curl);
 
@@ -430,7 +430,7 @@ void rssclient_scan(void) {
        /* Run no more than once every 15 minutes. */
        if ((now - last_run) < 900) {
                syslog(LOG_DEBUG,
-                       "Client: polling interval not yet reached; last run was %ldm%lds ago",
+                       "rssclient: polling interval not yet reached; last run was %ldm%lds ago",
                        ((now - last_run) / 60),
                        ((now - last_run) % 60)
                );
@@ -438,10 +438,10 @@ void rssclient_scan(void) {
        }
 
        become_session(&rss_CC);
-       syslog(LOG_DEBUG, "rssclient started");
+       syslog(LOG_DEBUG, "rssclient: started");
        CtdlForEachRoom(rssclient_scan_room, NULL);
        rss_pull_feeds();
-       syslog(LOG_DEBUG, "rssclient ended");
+       syslog(LOG_DEBUG, "rssclient: ended");
        last_run = time(NULL);
        return;
 }
@@ -451,7 +451,7 @@ CTDL_MODULE_INIT(rssclient)
 {
        if (!threading)
        {
-               syslog(LOG_INFO, "%s", curl_version());
+               syslog(LOG_INFO, "rssclient: using %s", curl_version());
                CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER, PRIO_AGGR + 300);
        }
        else