From f1ee61891901850ebbdee1e9440b363dc6df540a Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 17 Jan 2011 12:39:59 -0500 Subject: [PATCH] Removed the logging facility from citserver, use syslog instead added libevent modified files. --- citadel/citadel.h | 2 +- citadel/citserver.c | 64 +++---- citadel/clientsocket.c | 13 +- citadel/context.c | 32 ++-- citadel/context.h | 2 +- citadel/control.c | 14 +- citadel/database.c | 163 ++++++++--------- citadel/docs/citadel.html | 2 +- citadel/domain.c | 7 +- citadel/ecrash.c | 43 ++--- citadel/euidindex.c | 8 +- citadel/event_client.c | 44 ++--- citadel/event_client.h | 2 +- citadel/file_ops.c | 4 +- citadel/housekeeping.c | 23 ++- citadel/ical_dezonify.c | 29 +-- citadel/include/ctdl_module.h | 9 +- citadel/internet_addressing.c | 10 +- citadel/ldap.c | 30 ++-- citadel/locate_host.c | 19 +- citadel/modules/c-ares-dns/serv_c-ares-dns.c | 4 +- citadel/modules/calendar/serv_calendar.c | 72 ++++---- citadel/modules/checkpoint/serv_checkpoint.c | 4 +- citadel/modules/clamav/serv_virus.c | 16 +- citadel/modules/crypto/serv_crypto.c | 56 +++--- citadel/modules/dspam/serv_dspam.c | 10 +- .../modules/eventclient/serv_eventclient.c | 72 ++++---- citadel/modules/expire/serv_expire.c | 56 +++--- citadel/modules/extnotify/extnotify_main.c | 12 +- citadel/modules/extnotify/funambol65.c | 11 +- citadel/modules/fulltext/ft_wordbreaker.c | 4 +- citadel/modules/fulltext/serv_fulltext.c | 36 ++-- citadel/modules/imap/imap_fetch.c | 16 +- citadel/modules/imap/imap_list.c | 2 +- citadel/modules/imap/imap_misc.c | 4 +- citadel/modules/imap/imap_tools.c | 10 +- citadel/modules/imap/serv_imap.c | 56 +++--- citadel/modules/listsub/serv_listsub.c | 2 +- .../modules/managesieve/serv_managesieve.c | 10 +- citadel/modules/migrate/serv_migrate.c | 36 ++-- citadel/modules/network/serv_network.c | 134 +++++++------- citadel/modules/notes/serv_notes.c | 6 +- citadel/modules/openid/serv_openid_rp.c | 52 +++--- citadel/modules/pop3/serv_pop3.c | 14 +- citadel/modules/pop3client/serv_pop3client.c | 64 +++---- citadel/modules/rssclient/rss_atom_parser.c | 16 +- citadel/modules/rssclient/serv_rssclient.c | 24 +-- citadel/modules/sieve/serv_sieve.c | 80 ++++----- citadel/modules/smtp/serv_smtp.c | 38 ++-- citadel/modules/smtp/serv_smtpclient.c | 94 +++++----- citadel/modules/smtp/serv_smtpeventclient.c | 50 +++--- citadel/modules/smtp/serv_smtpqueue.c | 58 +++--- citadel/modules/smtp/smtp_clienthandlers.c | 12 +- citadel/modules/smtp/smtp_util.c | 14 +- citadel/modules/spam/serv_spam.c | 18 +- citadel/modules/test/serv_test.c | 10 +- citadel/modules/upgrade/serv_upgrade.c | 20 +-- .../urldeshortener/serv_expand_shorter_urls.c | 4 +- citadel/modules/vcard/serv_vcard.c | 30 ++-- citadel/modules/wiki/serv_wiki.c | 18 +- citadel/modules/xmpp/serv_xmpp.c | 18 +- citadel/modules/xmpp/xmpp_presence.c | 8 +- citadel/modules/xmpp/xmpp_query_namespace.c | 6 +- citadel/modules/xmpp/xmpp_queue.c | 2 +- citadel/msgbase.c | 170 +++++++++--------- citadel/parsedate.c | 11 +- citadel/room_ops.c | 22 +-- citadel/scripts/mk_module_init.sh | 32 ++-- citadel/serv_extensions.c | 109 ++++++----- citadel/server_main.c | 84 ++++----- citadel/sysdep.c | 170 ++++++------------ citadel/sysdep_decls.h | 9 - citadel/textclient/citadel.c | 4 +- citadel/threads.c | 99 +++++----- citadel/user_ops.c | 100 ++++++----- citadel/user_ops.h | 5 +- webcit/webserver.c | 6 + 77 files changed, 1286 insertions(+), 1334 deletions(-) diff --git a/citadel/citadel.h b/citadel/citadel.h index 5b4831b91..5e9d6fc8f 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -279,7 +279,7 @@ enum { #define SIEVECONFIG "application/x-citadel-sieve-config" #define XMPPMORTUARY "application/x-citadel-xmpp-mortuary" -#define TRACE CtdlLogPrintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__) +#define TRACE syslog(LOG_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__) #ifndef LONG_MAX #define LONG_MAX 2147483647L diff --git a/citadel/citserver.c b/citadel/citserver.c index 71ec7e05e..e1843eb20 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -1,9 +1,9 @@ /* * Main source module for the Citadel server * - * Copyright (c) 1987-2010 by the citadel.org team + * Copyright (c) 1987-2011 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * 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 by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -98,9 +98,9 @@ void cit_backtrace(void) strings = backtrace_symbols(stack_frames, size); for (i = 0; i < size; i++) { if (strings != NULL) - CtdlLogPrintf(CTDL_ALERT, "%s\n", strings[i]); + syslog(LOG_ALERT, "%s\n", strings[i]); else - CtdlLogPrintf(CTDL_ALERT, "%p\n", stack_frames[i]); + syslog(LOG_ALERT, "%p\n", stack_frames[i]); } free(strings); #endif @@ -126,7 +126,7 @@ void cit_oneline_backtrace(void) StrBufAppendPrintf(Buf, "%p : ", stack_frames[i]); } free(strings); - CtdlLogPrintf(CTDL_ALERT, "%s\n", ChrPtr(Buf)); + syslog(LOG_ALERT, "%s\n", ChrPtr(Buf)); FreeStrBuf(&Buf); } #endif @@ -147,9 +147,9 @@ void cit_panic_backtrace(int SigNum) strings = backtrace_symbols(stack_frames, size); for (i = 0; i < size; i++) { if (strings != NULL) - CtdlLogPrintf(CTDL_ALERT, "%s\n", strings[i]); + syslog(LOG_ALERT, "%s\n", strings[i]); else - CtdlLogPrintf(CTDL_ALERT, "%p\n", stack_frames[i]); + syslog(LOG_ALERT, "%p\n", stack_frames[i]); } free(strings); #endif @@ -166,10 +166,10 @@ void master_startup(void) { struct ctdlroom qrbuf; int rv; - CtdlLogPrintf(CTDL_DEBUG, "master_startup() started\n"); + syslog(LOG_DEBUG, "master_startup() started\n"); time(&server_startup_time); - CtdlLogPrintf(CTDL_INFO, "Opening databases\n"); + syslog(LOG_INFO, "Opening databases\n"); open_databases(); ctdl_thread_internal_init_tsd(); @@ -178,7 +178,7 @@ void master_startup(void) { check_ref_counts(); - CtdlLogPrintf(CTDL_INFO, "Creating base rooms (if necessary)\n"); + syslog(LOG_INFO, "Creating base rooms (if necessary)\n"); CtdlCreateRoom(config.c_baseroom, 0, "", 0, 1, 0, VIEW_BBS); CtdlCreateRoom(AIDEROOM, 3, "", 0, 1, 0, VIEW_BBS); CtdlCreateRoom(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS); @@ -196,7 +196,7 @@ void master_startup(void) { CtdlPutRoomLock(&qrbuf); } - CtdlLogPrintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n"); + syslog(LOG_INFO, "Seeding the pseudo-random number generator...\n"); urandom = fopen("/dev/urandom", "r"); if (urandom != NULL) { rv = fread(&seed, sizeof seed, 1, urandom); @@ -209,12 +209,12 @@ void master_startup(void) { srand(seed); srandom(seed); - CtdlLogPrintf(CTDL_INFO, "Initializing ipgm secret\n"); + syslog(LOG_INFO, "Initializing ipgm secret\n"); get_config(); config.c_ipgm_secret = rand(); put_config(); - CtdlLogPrintf(CTDL_DEBUG, "master_startup() finished\n"); + syslog(LOG_DEBUG, "master_startup() finished\n"); } @@ -240,7 +240,7 @@ void master_cleanup(int exitcode) { sysdep_master_cleanup(); /* Close databases */ - CtdlLogPrintf(CTDL_INFO, "Closing databases\n"); + syslog(LOG_INFO, "Closing databases\n"); close_databases(); #ifdef DEBUG_MEMORY_LEAKS @@ -249,7 +249,7 @@ void master_cleanup(int exitcode) { /* If the operator requested a halt but not an exit, halt here. */ if (shutdown_and_halt) { - CtdlLogPrintf(CTDL_NOTICE, "citserver: Halting server without exiting.\n"); + syslog(LOG_NOTICE, "citserver: Halting server without exiting.\n"); fflush(stdout); fflush(stderr); while(1) { sleep(32767); @@ -259,7 +259,7 @@ void master_cleanup(int exitcode) { release_control(); /* Now go away. */ - CtdlLogPrintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode); + syslog(LOG_NOTICE, "citserver: Exiting with status %d\n", exitcode); fflush(stdout); fflush(stderr); if (restart_server != 0) @@ -390,14 +390,14 @@ int is_public_client(void) */ if (stat(public_clients_file, &statbuf) != 0) { /* No public_clients file exists, so bail out */ - CtdlLogPrintf(CTDL_WARNING, "Warning: '%s' does not exist\n", + syslog(LOG_WARNING, "Warning: '%s' does not exist\n", public_clients_file); return(0); } if (statbuf.st_mtime > pc_timestamp) { begin_critical_section(S_PUBLIC_CLIENTS); - CtdlLogPrintf(CTDL_INFO, "Loading %s\n", public_clients_file); + syslog(LOG_INFO, "Loading %s\n", public_clients_file); public_clientspos = &public_clients[0]; public_clientsend = public_clientspos + SIZ; @@ -443,18 +443,18 @@ int is_public_client(void) end_critical_section(S_PUBLIC_CLIENTS); } - CtdlLogPrintf(CTDL_DEBUG, "Checking whether %s is a local or public client\n", + syslog(LOG_DEBUG, "Checking whether %s is a local or public client\n", CC->cs_addr); for (i=0; ics_addr, addrbuf)) { - CtdlLogPrintf(CTDL_DEBUG, "... yes it is.\n"); + syslog(LOG_DEBUG, "... yes it is.\n"); return(1); } } /* No hits. This is not a public client. */ - CtdlLogPrintf(CTDL_DEBUG, "... no it isn't.\n"); + syslog(LOG_DEBUG, "... no it isn't.\n"); return(0); } @@ -497,7 +497,7 @@ void cmd_iden(char *argbuf) CC->cs_addr[0] = 0; } - CtdlLogPrintf(CTDL_NOTICE, "Client %d/%d/%01d.%02d (%s) from %s\n", + syslog(LOG_NOTICE, "Client %d/%d/%01d.%02d (%s) from %s\n", dev_code, cli_code, (rev_level / 100), @@ -789,7 +789,7 @@ void cmd_ipgm(char *argbuf) else { sleep(5); cprintf("%d Authentication failed.\n", ERROR + PASSWORD_REQUIRED); - CtdlLogPrintf(CTDL_ERR, "Warning: ipgm authentication failed.\n"); + syslog(LOG_ERR, "Warning: ipgm authentication failed.\n"); CC->kill_me = 1; } } @@ -814,7 +814,7 @@ void cmd_down(char *argbuf) { } if ((restart_server > 0) && !running_as_daemon) { - CtdlLogPrintf(CTDL_ERR, "The user requested restart, but not running as daemon! Geronimooooooo!\n"); + syslog(LOG_ERR, "The user requested restart, but not running as daemon! Geronimooooooo!\n"); Reply = "%d Warning: citserver is not running in daemon mode and is therefore unlikely to restart automatically.\n"; state = ERROR; } @@ -859,7 +859,7 @@ void cmd_scdn(char *argbuf) restart_server = 1; if (!running_as_daemon) { - CtdlLogPrintf(CTDL_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n"); + syslog(LOG_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n"); Reply = "%d %d Warning, not running in deamon mode. maybe we will come up again, but don't lean on it.\n"; state = ERROR; } @@ -955,7 +955,7 @@ void begin_session(CitContext *con) /*fill in the user data structure */ if(getsockopt(con->client_socket, SOL_SOCKET, SO_PEERCRED, &credentials, &ucred_length)) { - CtdlLogPrintf(CTDL_NOTICE, "could obtain credentials from unix domain socket"); + syslog(LOG_NOTICE, "could obtain credentials from unix domain socket"); } else { @@ -991,10 +991,10 @@ void begin_session(CitContext *con) } if (!CC->is_local_socket) { - CtdlLogPrintf(CTDL_NOTICE, "Session (%s) started from %s (%s).\n", con->ServiceName, con->cs_host, con->cs_addr); + syslog(LOG_NOTICE, "Session (%s) started from %s (%s).\n", con->ServiceName, con->cs_host, con->cs_addr); } else { - CtdlLogPrintf(CTDL_NOTICE, "Session (%s) started via local socket UID:%d.\n", con->ServiceName, con->cs_UDSclientUID); + syslog(LOG_NOTICE, "Session (%s) started via local socket UID:%d.\n", con->ServiceName, con->cs_UDSclientUID); } /* Run any session startup routines registered by loadable modules */ @@ -1056,7 +1056,7 @@ void do_command_loop(void) { time(&CC->lastcmd); memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\n"); + syslog(LOG_ERR, "Client disconnected: ending session.\n"); CC->kill_me = 1; CtdlThreadName(old_name); return; @@ -1064,10 +1064,10 @@ void do_command_loop(void) { /* Log the server command, but don't show passwords... */ if ( (strncasecmp(cmdbuf, "PASS", 4)) && (strncasecmp(cmdbuf, "SETP", 4)) ) { - CtdlLogPrintf(CTDL_INFO, "CtdlCommand [%s] [%s] %s\n", CTDLUSERIP, CC->curr_user, cmdbuf); + syslog(LOG_INFO, "CtdlCommand [%s] [%s] %s\n", CTDLUSERIP, CC->curr_user, cmdbuf); } else { - CtdlLogPrintf(CTDL_INFO, "CtdlCommand [%s] [%s]