From: Art Cancro Date: Thu, 30 Mar 2017 13:47:36 +0000 (-0400) Subject: updated modules/network/*.c to new logging standard X-Git-Tag: v939~581 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=8c89db5308e55a1dd5c022dee7fe6b66c09d8da7 updated modules/network/*.c to new logging standard --- diff --git a/citadel/modules/network/serv_netfilter.c b/citadel/modules/network/serv_netfilter.c index 588cced6a..121ef3116 100644 --- a/citadel/modules/network/serv_netfilter.c +++ b/citadel/modules/network/serv_netfilter.c @@ -1,21 +1,15 @@ /* * A server-side module for Citadel designed to filter idiots off the network. * - * Copyright (c) 2002-2012 by the citadel.org team + * Copyright (c) 2002-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" diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c index 0c90b46cf..76018eba0 100644 --- a/citadel/modules/network/serv_netmail.c +++ b/citadel/modules/network/serv_netmail.c @@ -86,7 +86,6 @@ void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRN int i; size_t recps_len = 0; RoomNetCfgLine *nptr; - struct CitContext *CCC = CC; *recps = NULL; /* @@ -103,9 +102,7 @@ void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRN *recps = NewStrBufPlain(NULL, recps_len); if (*recps == NULL) { - QN_syslog(LOG_EMERG, - "Cannot allocate %ld bytes for recps...\n", - (long)recps_len); + syslog(LOG_ERR, "netmail: cannot allocate %ld bytes for recps", (long)recps_len); abort(); } @@ -493,15 +490,12 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long sc->working_ignetcfg, sc->the_netmap) != 0) { - QN_syslog(LOG_ERR, - "Invalid node <%s>\n", - ChrPtr(Recipient)); - + syslog(LOG_ERR, "netmail: invalid node <%s>", ChrPtr(Recipient)); send = 0; } /* Check for split horizon */ - QN_syslog(LOG_DEBUG, "Path is %s\n", msg->cm_fields[eMessagePath]); + syslog(LOG_DEBUG, "netmail: path is %s", msg->cm_fields[eMessagePath]); bang = num_tokens(msg->cm_fields[eMessagePath], '!'); if (bang > 1) { for (i=0; i<(bang-1); ++i) { @@ -510,18 +504,14 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long i, '!', sizeof buf); - QN_syslog(LOG_DEBUG, "Compare <%s> to <%s>\n", - buf, ChrPtr(Recipient)) ; + syslog(LOG_DEBUG, "netmail: compare <%s> to <%s>", buf, ChrPtr(Recipient)) ; if (!strcasecmp(buf, ChrPtr(Recipient))) { send = 0; break; } } - QN_syslog(LOG_INFO, - " %sSending to %s\n", - (send)?"":"Not ", - ChrPtr(Recipient)); + syslog(LOG_INFO, "netmail: %ssending to %s", (send)?"":"not ", ChrPtr(Recipient)); } /* Send the message */ @@ -553,9 +543,7 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long rand() ); - QN_syslog(LOG_DEBUG, - "Appending to %s\n", - filename); + syslog(LOG_DEBUG, "netmail: appending to %s", filename); fp = fopen(filename, "ab"); if (fp != NULL) { @@ -564,10 +552,7 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long fclose(fp); } else { - QN_syslog(LOG_ERR, - "%s: %s\n", - filename, - strerror(errno)); + syslog(LOG_ERR, "%s: %s\n", filename, strerror(errno)); } /* free the serialized version */ @@ -596,7 +581,7 @@ void network_spool_msg(long msgnum, void *userdata) if (msg == NULL) { - syslog(LOG_ERR, "failed to load Message <%ld> from disk\n", msgnum); + syslog(LOG_ERR, "netmail: failed to load Message <%ld> from disk", msgnum); return; } network_process_list(sc, msg, &delete_after_send); diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index a974fd93b..3c8df1e8c 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -2,7 +2,7 @@ * This module handles shared rooms, inter-Citadel mail, and outbound * mailing list processing. * - * Copyright (c) 2000-2016 by the citadel.org team + * Copyright (c) 2000-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. @@ -163,7 +163,7 @@ int network_sync_to(char *target_node, long len) DeleteHash(&sc.the_netmap); free_spoolcontrol_struct_members(&sc); - QN_syslog(LOG_NOTICE, "Synchronized %d messages to <%s>", num_spooled, target_node); + syslog(LOG_NOTICE, "network: synchronized %d messages to <%s>", num_spooled, target_node); return(num_spooled); } @@ -302,7 +302,6 @@ void destroy_network_queue_room_locked (void) */ void network_do_queue(void) { - struct CitContext *CCC = CC; static time_t last_run = 0L; int full_processing = 1; HashList *working_ignetcfg; @@ -319,9 +318,7 @@ void network_do_queue(void) if ( (time(NULL) - last_run) < CtdlGetConfigLong("c_net_freq") ) { full_processing = 0; - MARK_syslog(LOG_DEBUG, "Network full processing in %ld seconds.", - CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run) - ); + syslog(LOG_DEBUG, "network: full processing in %ld seconds.", CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)); } become_session(&networker_spool_CC); @@ -345,14 +342,14 @@ void network_do_queue(void) * Go ahead and run the queue */ if (full_processing && !server_shutting_down) { - QNM_syslog(LOG_DEBUG, "network: loading outbound queue"); + syslog(LOG_DEBUG, "network: loading outbound queue"); CtdlForEachNetCfgRoom(network_queue_interesting_rooms, &RL); } if ((RL.rplist != NULL) && (!server_shutting_down)) { RoomProcList *ptr, *cmp; ptr = RL.rplist; - QNM_syslog(LOG_DEBUG, "network: running outbound queue"); + syslog(LOG_DEBUG, "network: running outbound queue"); while (ptr != NULL && !server_shutting_down) { cmp = ptr->next; @@ -392,9 +389,7 @@ void network_do_queue(void) } /* If there is anything in the inbound queue, process it */ if (!server_shutting_down) { - network_do_spoolin(working_ignetcfg, - the_netmap, - &netmap_changed); + network_do_spoolin(working_ignetcfg, the_netmap, &netmap_changed); } /* Free the filter list in memory */ @@ -417,7 +412,7 @@ void network_do_queue(void) DeleteHash(&working_ignetcfg); - QNM_syslog(LOG_DEBUG, "network: queue run completed"); + syslog(LOG_DEBUG, "network: queue run completed"); if (full_processing) { last_run = time(NULL); @@ -503,8 +498,7 @@ int ignet_aftersave(struct CtdlMessage *msg, recptypes *recps) if (network_fp != NULL) { rv = fwrite(smr.ser, smr.len, 1, network_fp); if (rv == -1) { - MSG_syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s", - strerror(errno)); + syslog(LOG_EMERG, "network: CtdlSubmitMsg() Couldn't write network spool file: %s", strerror(errno)); } fclose(network_fp); }