From e704ad0e3d1ecb2f5e0c46984cc8902fcdc0ec36 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 7 Apr 2017 11:35:19 -0400 Subject: [PATCH] Converted two more .c files to new logging standard --- citadel/internet_addressing.c | 30 +++---- citadel/sysdep.c | 159 ++++++++++++++-------------------- 2 files changed, 79 insertions(+), 110 deletions(-) diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index c18f8b364..a3ef1f815 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -459,7 +459,7 @@ int alias(char *name) } if (strcasecmp(original_name, name)) { - syslog(LOG_INFO, "%s is being forwarded to %s\n", original_name, name); + syslog(LOG_INFO, "internet_addressing: %s is being forwarded to %s", original_name, name); } /* Change "user @ xxx" to "user" if xxx is an alias for this host */ @@ -467,7 +467,7 @@ int alias(char *name) if (name[a] == '@') { if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) { name[a] = 0; - syslog(LOG_INFO, "Changed to <%s>\n", name); + syslog(LOG_DEBUG, "internet_addressing: changed to <%s>", name); break; } } @@ -620,7 +620,7 @@ recptypes *validate_recipients(const char *supplied_recipients, striplt(this_recp); if (IsEmptyStr(this_recp)) break; - syslog(LOG_DEBUG, "Evaluating recipient #%d: %s\n", num_recps, this_recp); + syslog(LOG_DEBUG, "internet_addressing: evaluating recipient #%d: %s", num_recps, this_recp); ++num_recps; strcpy(org_recp, this_recp); @@ -773,12 +773,9 @@ recptypes *validate_recipients(const char *supplied_recipients, strcpy(ret->errormsg, "No recipients specified."); } - syslog(LOG_DEBUG, "validate_recipients()\n"); - syslog(LOG_DEBUG, " local: %d <%s>\n", ret->num_local, ret->recp_local); - syslog(LOG_DEBUG, " room: %d <%s>\n", ret->num_room, ret->recp_room); - syslog(LOG_DEBUG, " inet: %d <%s>\n", ret->num_internet, ret->recp_internet); - syslog(LOG_DEBUG, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet); - syslog(LOG_DEBUG, " error: %d <%s>\n", ret->num_error, ret->errormsg); + syslog(LOG_DEBUG, "internet_addressing: validate_recipients() = %d local, %d room, %d SMTP, %d IGnet, %d error", + ret->num_local, ret->num_room, ret->num_internet, ret->num_ignet, ret->num_error + ); free(recipients); return(ret); @@ -795,7 +792,7 @@ void free_recipients(recptypes *valid) { } if (valid->recptypes_magic != RECPTYPES_MAGIC) { - syslog(LOG_EMERG, "Attempt to call free_recipients() on some other data type!\n"); + syslog(LOG_ERR, "internet_addressing: attempt to call free_recipients() on some other data type!"); abort(); } @@ -833,7 +830,7 @@ char *qp_encode_email_addrs(char *source) if (source == NULL) return source; if (IsEmptyStr(source)) return source; - syslog(LOG_DEBUG, "qp_encode_email_addrs: [%s]\n", source); + syslog(LOG_DEBUG, "internet_addressing: qp_encode_email_addrs <%s>", source); AddrPtr = malloc (sizeof (long) * nAddrPtrMax); AddrUtf8 = malloc (sizeof (long) * nAddrPtrMax); @@ -1221,7 +1218,7 @@ int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) { else if (!strcasecmp(key, "From")) { process_rfc822_addr(value, user, node, name); - syslog(LOG_DEBUG, "Converted to <%s@%s> (%s)\n", user, node, name); + syslog(LOG_DEBUG, "internet_addressing: converted to <%s@%s> (%s)", user, node, name); snprintf(addr, sizeof(addr), "%s@%s", user, node); if (CM_IsEmpty(msg, eAuthor) && !IsEmptyStr(name)) CM_SetField(msg, eAuthor, name, strlen(name)); @@ -1256,7 +1253,7 @@ int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) { else if (!strcasecmp(key, "Message-ID")) { if (!CM_IsEmpty(msg, emessageId)) { - syslog(LOG_WARNING, "duplicate message id\n"); + syslog(LOG_WARNING, "internet_addressing: duplicate message id"); } else { char *pValue; @@ -1534,11 +1531,10 @@ void directory_key(char *key, char *addr) { } key[keylen++] = 0; - syslog(LOG_DEBUG, "Directory key is <%s>\n", key); + syslog(LOG_DEBUG, "internet_addressing: directory key is <%s>", key); } - /* Return nonzero if the supplied address is in a domain we keep in * the directory */ @@ -1579,7 +1575,7 @@ int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) { if (IsDirectory(internet_addr, 0) == 0) return 0; - syslog(LOG_DEBUG, "Create directory entry: %s --> %s\n", internet_addr, citadel_addr); + syslog(LOG_DEBUG, "internet_addressing: create directory entry: %s --> %s", internet_addr, citadel_addr); directory_key(key, internet_addr); cdb_store(CDB_DIRECTORY, key, strlen(key), citadel_addr, strlen(citadel_addr)+1 ); return 1; @@ -1595,7 +1591,7 @@ int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) { int CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) { char key[SIZ]; - syslog(LOG_DEBUG, "Delete directory entry: %s --> %s\n", internet_addr, citadel_addr); + syslog(LOG_DEBUG, "internet_addressing: delete directory entry: %s --> %s", internet_addr, citadel_addr); directory_key(key, internet_addr); return cdb_delete(CDB_DIRECTORY, key, strlen(key) ) == 0; } diff --git a/citadel/sysdep.c b/citadel/sysdep.c index 3ec7d16cc..67c7a7b9e 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -51,7 +51,7 @@ volatile int restart_server = 0; volatile int running_as_daemon = 0; static RETSIGTYPE signal_cleanup(int signum) { - syslog(LOG_DEBUG, "Caught signal %d; shutting down.", signum); + syslog(LOG_DEBUG, "sysdep: caught signal %d; shutting down.", signum); exit_signal = signum; server_shutting_down = 1; } @@ -91,7 +91,7 @@ void init_sysdep(void) { * session to which the calling thread is currently bound. */ if (pthread_key_create(&MyConKey, NULL) != 0) { - syslog(LOG_CRIT, "Can't create TSD key: %s", strerror(errno)); + syslog(LOG_CRIT, "sysdep: can't create TSD key: %s", strerror(errno)); } /* @@ -155,10 +155,8 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme { ip_version = 4; if (inet_pton(AF_INET, ip_addr, &sin4.sin_addr) <= 0) { - snprintf(errormessage, SIZ, - "Error binding to [%s] : %s", ip_addr, strerror(errno) - ); - syslog(LOG_ALERT, "%s", errormessage); + snprintf(errormessage, SIZ, "Error binding to [%s] : %s", ip_addr, strerror(errno)); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); return (-1); } } @@ -169,14 +167,14 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme snprintf(errormessage, SIZ, "Error binding to [%s] : %s", ip_addr, strerror(errno) ); - syslog(LOG_ALERT, "%s", errormessage); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); return (-1); } } if (port_number == 0) { snprintf(errormessage, SIZ, "Can't start: no port number specified."); - syslog(LOG_ALERT, "%s", errormessage); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); return (-1); } sin6.sin6_port = htons((u_short) port_number); @@ -186,10 +184,8 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme s = socket( ((ip_version == 6) ? PF_INET6 : PF_INET), SOCK_STREAM, (p->p_proto)); if (s < 0) { - snprintf(errormessage, SIZ, - "Can't create a listening socket: %s", strerror(errno) - ); - syslog(LOG_ALERT, "%s", errormessage); + snprintf(errormessage, SIZ, "Can't create a listening socket: %s", strerror(errno)); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); return (-1); } /* Set some socket options that make sense. */ @@ -204,29 +200,22 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme } if (b < 0) { - snprintf(errormessage, SIZ, - "Can't bind: %s", strerror(errno) - ); - syslog(LOG_ALERT, "%s", errormessage); + snprintf(errormessage, SIZ, "Can't bind: %s", strerror(errno)); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); return (-1); } fcntl(s, F_SETFL, O_NONBLOCK); if (listen(s, ((queue_len >= 5) ? queue_len : 5) ) < 0) { - snprintf(errormessage, SIZ, - "Can't listen: %s", strerror(errno) - ); - syslog(LOG_ALERT, "%s", errormessage); + snprintf(errormessage, SIZ, "Can't listen: %s", strerror(errno)); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); return (-1); } return (s); } - - - /* * Create a Unix domain socket and listen on it */ @@ -245,10 +234,8 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) i = unlink(sockpath); if ((i != 0) && (errno != ENOENT)) { - snprintf(errormessage, SIZ, "citserver: can't unlink %s: %s", - sockpath, strerror(errno) - ); - syslog(LOG_EMERG, "%s", errormessage); + snprintf(errormessage, SIZ, "can't unlink %s: %s", sockpath, strerror(errno)); + syslog(LOG_EMERG, "udsserver: %s", errormessage); return(-1); } @@ -258,28 +245,28 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) s = socket(AF_UNIX, SOCK_STREAM, 0); if (s < 0) { - snprintf(errormessage, SIZ, "citserver: Can't create a socket: %s", strerror(errno)); - syslog(LOG_EMERG, "%s", errormessage); + snprintf(errormessage, SIZ, "can't create a socket: %s", strerror(errno)); + syslog(LOG_EMERG, "udsserver: %s", errormessage); return(-1); } if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - snprintf(errormessage, SIZ, "citserver: Can't bind: %s", strerror(errno)); - syslog(LOG_EMERG, "%s", errormessage); + snprintf(errormessage, SIZ, "can't bind: %s", strerror(errno)); + syslog(LOG_EMERG, "udsserver: %s", errormessage); return(-1); } /* set to nonblock - we need this for some obscure situations */ if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) { - snprintf(errormessage, SIZ, "citserver: Can't set socket to non-blocking: %s", strerror(errno)); - syslog(LOG_EMERG, "%s", errormessage); + snprintf(errormessage, SIZ, "can't set socket to non-blocking: %s", strerror(errno)); + syslog(LOG_EMERG, "udsserver: %s", errormessage); close(s); return(-1); } if (listen(s, actual_queue_len) < 0) { - snprintf(errormessage, SIZ, "citserver: Can't listen: %s", strerror(errno)); - syslog(LOG_EMERG, "%s", errormessage); + snprintf(errormessage, SIZ, "can't listen: %s", strerror(errno)); + syslog(LOG_EMERG, "udsserver: %s", errormessage); return(-1); } @@ -292,7 +279,6 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) } - /* * The following functions implement output buffering on operating systems which * support it (such as Linux and various BSD flavors). @@ -356,15 +342,12 @@ void client_close(void) { if (!CCC) return; if (CCC->client_socket <= 0) return; - syslog(LOG_DEBUG, "Closing socket %d", CCC->client_socket); - + syslog(LOG_DEBUG, "sysdep: closing socket %d", CCC->client_socket); close(CCC->client_socket); CCC->client_socket = -1 ; } - - /* * client_write() ... Send binary data to the client. */ @@ -393,7 +376,7 @@ int client_write(const char *buf, int nbytes) fd = fopen(fn, "a+"); if (fd == NULL) { - syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + syslog(LOG_ERR, "%s: %s", fn, strerror(errno)); cit_backtrace(); exit(1); } @@ -427,9 +410,7 @@ int client_write(const char *buf, int nbytes) if (select(1, NULL, &wset, NULL, NULL) == -1) { if (errno == EINTR) { - syslog(LOG_DEBUG, "client_write(%d bytes) select() interrupted.", - nbytes-bytes_written - ); + syslog(LOG_DEBUG, "sysdep: client_write(%d bytes) select() interrupted.", nbytes-bytes_written); if (server_shutting_down) { CC->kill_me = KILLME_SELECT_INTERRUPTED; return (-1); @@ -439,7 +420,7 @@ int client_write(const char *buf, int nbytes) } } else { syslog(LOG_ERR, - "client_write(%d bytes) select failed: %s (%d)", + "sysdep: client_write(%d bytes) select failed: %s (%d)", nbytes - bytes_written, strerror(errno), errno ); @@ -454,7 +435,7 @@ int client_write(const char *buf, int nbytes) retval = write(Ctx->client_socket, &buf[bytes_written], nbytes - bytes_written); if (retval < 1) { syslog(LOG_ERR, - "client_write(%d bytes) failed: %s (%d)", + "sysdep: client_write(%d bytes) failed: %s (%d)", nbytes - bytes_written, strerror(errno), errno ); @@ -519,7 +500,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) fd = fopen(fn, "a+"); if (fd == NULL) { - syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + syslog(LOG_ERR, "%s: %s", fn, strerror(errno)); cit_backtrace(); exit(1); } @@ -532,14 +513,14 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) #endif retval = client_read_sslblob(Target, bytes, timeout); if (retval < 0) { - syslog(LOG_CRIT, "client_read_blob() failed"); + syslog(LOG_ERR, "sysdep: client_read_blob() failed"); } #ifdef BIGBAD_IODBG snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); fd = fopen(fn, "a+"); if (fd == NULL) { - syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + syslog(LOG_ERR, "%s: %s", fn, strerror(errno)); cit_backtrace(); exit(1); } @@ -561,7 +542,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) fd = fopen(fn, "a+"); if (fd == NULL) { - syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + syslog(LOG_ERR, "%s: %s", fn, strerror(errno)); cit_backtrace(); exit(1); } @@ -581,7 +562,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) &Error ); if (retval < 0) { - syslog(LOG_CRIT, "client_read_blob() failed: %s", Error); + syslog(LOG_ERR, "sysdep: client_read_blob() failed: %s", Error); client_close(); return retval; } @@ -590,7 +571,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) fd = fopen(fn, "a+"); if (fd == NULL) { - syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + syslog(LOG_ERR, "%s: %s", fn, strerror(errno)); cit_backtrace(); exit(1); } @@ -649,7 +630,7 @@ int client_read_random_blob(StrBuf *Target, int timeout) fd = fopen(fn, "a+"); if (fd == NULL) { - syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + syslog(LOG_ERR, "%s: %s", fn, strerror(errno)); cit_backtrace(); exit(1); } @@ -734,7 +715,7 @@ int CtdlClientGetLine(StrBuf *Target) fd = fopen(fn, "a+"); if (fd == NULL) { - syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + syslog(LOG_ERR, "%s: %s", fn, strerror(errno)); cit_backtrace(); exit(1); } @@ -774,7 +755,7 @@ int CtdlClientGetLine(StrBuf *Target) fclose(fd); if (rc < 0) { - syslog(LOG_CRIT, "CtdlClientGetLine() failed"); + syslog(LOG_ERR, "sysdep: CtdlClientGetLine() failed"); } #endif return rc; @@ -792,7 +773,7 @@ int CtdlClientGetLine(StrBuf *Target) fd = fopen(fn, "a+"); if (fd == NULL) { - syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + syslog(LOG_ERR, "%s: %s", fn, strerror(errno)); cit_backtrace(); exit(1); } @@ -837,7 +818,7 @@ int CtdlClientGetLine(StrBuf *Target) fclose(fd); if ((rc < 0) && (Error != NULL)) { - syslog(LOG_CRIT, "CtdlClientGetLine() failed: %s", Error); + syslog(LOG_ERR, "sysdep: CtdlClientGetLine() failed: %s", Error); } #endif return rc; @@ -901,12 +882,13 @@ void close_masters (void) if (serviceptr->tcp_port > 0) { - if (serviceptr->msock == -1) + if (serviceptr->msock == -1) { Text = "not closing again"; - else + } + else { Text = "Closing"; - - syslog(LOG_INFO, "%s %d listener on port %d", + } + syslog(LOG_INFO, "sysdep: %s %d listener on port %d", Text, serviceptr->msock, serviceptr->tcp_port @@ -916,12 +898,13 @@ void close_masters (void) if (serviceptr->sockpath != NULL) { - if (serviceptr->msock == -1) + if (serviceptr->msock == -1) { Text = "not closing again"; - else + } + else { Text = "Closing"; - - syslog(LOG_INFO, "%s %d listener on '%s'", + } + syslog(LOG_INFO, "sysdep: %s %d listener on '%s'", Text, serviceptr->msock, serviceptr->sockpath @@ -1001,10 +984,9 @@ void start_daemon(int unused) { * We don't just call close() because we don't want these fd's * to be reused for other files. */ - if (chdir(ctdl_run_dir) != 0) - syslog(LOG_EMERG, - "unable to change into directory [%s]: %s", - ctdl_run_dir, strerror(errno)); + if (chdir(ctdl_run_dir) != 0) { + syslog(LOG_ERR, "%s: %s", ctdl_run_dir, strerror(errno)); + } child = fork(); if (child != 0) { @@ -1017,28 +999,23 @@ void start_daemon(int unused) { setsid(); umask(0); - if ((freopen("/dev/null", "r", stdin) != stdin) || - (freopen("/dev/null", "w", stdout) != stdout) || - (freopen("/dev/null", "w", stderr) != stderr)) - syslog(LOG_EMERG, - "unable to reopen stdin/out/err %s", - strerror(errno)); - + if ( (freopen("/dev/null", "r", stdin) != stdin) || + (freopen("/dev/null", "w", stdout) != stdout) || + (freopen("/dev/null", "w", stderr) != stderr) + ) { + syslog(LOG_ERR, "sysdep: unable to reopen stdio: %s", strerror(errno)); + } do { current_child = fork(); - signal(SIGTERM, graceful_shutdown); - if (current_child < 0) { perror("fork"); exit(errno); } - else if (current_child == 0) { return; /* continue starting citadel. */ } - else { fp = fopen(file_pid_file, "w"); if (fp != NULL) { @@ -1047,7 +1024,6 @@ void start_daemon(int unused) { } waitpid(current_child, &status, 0); } - nFireUpsNonRestart = nFireUps; /* Exit code 0 means the watcher should exit */ @@ -1081,7 +1057,7 @@ void checkcrash(void) { StrBuf *CrashMail; CrashMail = NewStrBuf(); - syslog(LOG_ALERT, "Posting crash message\n"); + syslog(LOG_ALERT, "sysdep: posting crash message"); StrBufPrintf(CrashMail, " \n" " The Citadel server process (citserver) terminated unexpectedly." @@ -1159,8 +1135,8 @@ void HuntBadSession(void) (errno == EBADF)) { /* Gotcha! */ - syslog(LOG_EMERG, - "Killing Session CC[%d] bad FD: [%d:%d] User[%s] Host[%s:%s]\n", + syslog(LOG_ERR, + "sysdep: killing session CC[%d] bad FD: [%d:%d] User[%s] Host[%s:%s]", ptr->cs_pid, ptr->client_socket, ptr->is_local_socket, @@ -1193,10 +1169,7 @@ void HuntBadSession(void) (errno == EBADF)) { /* Gotcha! server socket dead? commit suicide! */ - syslog(LOG_EMERG, - "Found bad FD: %d and its a server socket! Shutting Down!\n", - serviceptr->msock); - + syslog(LOG_ERR, "sysdep: found bad FD: %d and its a server socket! Shutting Down!", serviceptr->msock); server_shutting_down = 1; break; } @@ -1299,12 +1272,12 @@ do_select: force_purge = 0; */ if (retval < 0) { if (errno == EBADF) { - syslog(LOG_EMERG, "select() failed: (%s)\n", strerror(errno)); - HuntBadSession (); + syslog(LOG_ERR, "sysdep: select() failed: (%s)", strerror(errno)); + HuntBadSession(); goto do_select; } if (errno != EINTR) { - syslog(LOG_EMERG, "Exiting (%s)\n", strerror(errno)); + syslog(LOG_ERR, "sysdep: exiting (%s)", strerror(errno)); server_shutting_down = 1; continue; } else { @@ -1329,14 +1302,14 @@ do_select: force_purge = 0; if (FD_ISSET(serviceptr->msock, &readfds)) { ssock = accept(serviceptr->msock, NULL, 0); if (ssock >= 0) { - syslog(LOG_DEBUG, "New client socket %d", ssock); + syslog(LOG_DEBUG, "sysdep: new client socket %d", ssock); /* The master socket is non-blocking but the client * sockets need to be blocking, otherwise certain * operations barf on FreeBSD. Not a fatal error. */ if (fcntl(ssock, F_SETFL, 0) < 0) { - syslog(LOG_EMERG, "citserver: Can't set socket to blocking: %s", strerror(errno)); + syslog(LOG_ERR, "sysdep: Can't set socket to blocking: %s", strerror(errno)); } /* New context will be created already -- 2.30.2