From 984ea5827d1658847bf958cb9a373d4306de0c24 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 24 Mar 2017 16:15:18 -0400 Subject: [PATCH] Updated more modules to the new logging standard --- citadel/modules/fulltext/ft_wordbreaker.c | 26 +++++-------- citadel/modules/fulltext/serv_fulltext.c | 39 ++++++++------------ citadel/modules/pop3client/serv_pop3client.c | 14 +++---- citadel/modules/rssclient/serv_rssclient.c | 18 ++++----- 4 files changed, 40 insertions(+), 57 deletions(-) diff --git a/citadel/modules/fulltext/ft_wordbreaker.c b/citadel/modules/fulltext/ft_wordbreaker.c index 3c61697c8..b2ba828bb 100644 --- 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 #include @@ -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 3709ef631..522c3824a 100644 --- 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= 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 63f709e16..ab2c4a6cd 100644 --- 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; inext; @@ -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 72ce11ed2..0b89a9563 100644 --- 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 -- 2.30.2