X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=log.c;h=cbe4a85bf013fd8d2c432ba510b1f9ac301bb1d6;hp=16ed60a1cb24a074fa11c1c05905a8e3125132d9;hb=ba703386fd742f46f83430a7c48a9bfe53167eae;hpb=08ee90a207d1a9c0b3e34d1db06cd7502ad48990 diff --git a/log.c b/log.c index 16ed60a..cbe4a85 100644 --- a/log.c +++ b/log.c @@ -14,32 +14,28 @@ bool_t secnet_is_daemon=False; uint32_t message_level=M_WARNING|M_ERR|M_SECURITY|M_FATAL; struct log_if *system_log=NULL; -static void vMessage(uint32_t class, const char *message, va_list args) +static void vMessageFallback(uint32_t class, const char *message, va_list args) + FORMAT(printf,2,0); +static void vMessageFallback(uint32_t class, const char *message, va_list args) { FILE *dest=stdout; -#define MESSAGE_BUFLEN 1023 - static char buff[MESSAGE_BUFLEN+1]={0,}; - uint32_t bp; - char *nlp; + /* Messages go to stdout/stderr */ + if (class & message_level) { + if (class&M_FATAL || class&M_ERR || class&M_WARNING) { + dest=stderr; + } + vfprintf(dest,message,args); + } +} - if (secnet_is_daemon) { +static void vMessage(uint32_t class, const char *message, va_list args) +{ + + if (system_log) { /* Messages go to the system log interface */ - bp=strlen(buff); - vsnprintf(buff+bp,MESSAGE_BUFLEN-bp,message,args); - /* Each line is sent separately */ - while ((nlp=strchr(buff,'\n'))) { - *nlp=0; - slilog(system_log,class,buff); - memmove(buff,nlp+1,strlen(nlp+1)+1); - } + vslilog_part(system_log, class, message, args); } else { - /* Messages go to stdout/stderr */ - if (class & message_level) { - if (class&M_FATAL || class&M_ERR || class&M_WARNING) { - dest=stderr; - } - vfprintf(dest,message,args); - } + vMessageFallback(class,message,args); } } @@ -52,6 +48,17 @@ void Message(uint32_t class, const char *message, ...) va_end(ap); } +static void MessageFallback(uint32_t class, const char *message, ...) + FORMAT(printf,2,3); +static void MessageFallback(uint32_t class, const char *message, ...) +{ + va_list ap; + + va_start(ap,message); + vMessageFallback(class,message,ap); + va_end(ap); +} + static NORETURN(vfatal(int status, bool_t perror, const char *message, va_list args)); @@ -153,11 +160,11 @@ void cfgfile_postreadcheck(struct cloc loc, FILE *f) { assert(loc.file); if (ferror(f)) { - Message(M_FATAL, "error reading config file (%s): %s", + Message(M_FATAL, "error reading config file (%s): %s\n", loc.file, strerror(errno)); exit(current_phase); } else if (feof(f)) { - Message(M_FATAL, "unexpected end of config file (%s)", loc.file); + Message(M_FATAL, "unexpected end of config file (%s)\n", loc.file); exit(current_phase); } } @@ -174,7 +181,7 @@ static void log_vmulti(void *sst, int class, const char *message, va_list args) if (secnet_is_daemon) { for (i=st; i; i=i->next) { - i->l->vlog(i->l->st,class,message,args); + vslilog(i->l,class,message,args); } } else { vMessage(class,message,args); @@ -182,13 +189,57 @@ static void log_vmulti(void *sst, int class, const char *message, va_list args) } } -static void log_multi(void *st, int priority, const char *message, ...) +void lg_vperror(struct log_if *lg, const char *desc, struct cloc *loc, + int class, int errnoval, const char *fmt, va_list al) { - va_list ap; + int status=current_phase; + int esave=errno; - va_start(ap,message); - log_vmulti(st,priority,message,ap); - va_end(ap); + if (!lg) + lg=system_log; + + if (class & M_FATAL) + enter_phase(PHASE_SHUTDOWN); + + slilog_part(lg,class,"%s",desc); + if (loc) + slilog_part(lg,class," (%s:%d)",loc->file,loc->line); + slilog_part(lg,class,": "); + vslilog_part(lg,class,fmt,al); + if (errnoval) + slilog_part(lg,class,": %s",strerror(errnoval)); + slilog_part(lg,class,"\n"); + + if (class & M_FATAL) + exit(status); + + errno=esave; +} + +void lg_perror(struct log_if *lg, const char *desc, struct cloc *loc, + int class, int errnoval, const char *fmt, ...) +{ + va_list al; + va_start(al,fmt); + lg_vperror(lg,desc,loc,class,errnoval,fmt,al); + va_end(al); +} + +void lg_exitstatus(struct log_if *lg, const char *desc, struct cloc *loc, + int class, int status, const char *progname) +{ + if (!status) + lg_perror(lg,desc,loc,class,0,"%s exited",progname); + else if (WIFEXITED(status)) + lg_perror(lg,desc,loc,class,0,"%s exited with error exit status %d", + progname,WEXITSTATUS(status)); + else if (WIFSIGNALED(status)) + lg_perror(lg,desc,loc,class,0,"%s died due to fatal signal %s (%d)%s", + progname,strsignal(WTERMSIG(status)),WTERMSIG(status), + WCOREDUMP(status)?" (core dumped)":""); + else + lg_perror(lg,desc,loc,class,0,"%s died with unknown wait status %d", + progname,status); } struct log_if *init_log(list_t *ll) @@ -225,8 +276,8 @@ struct log_if *init_log(list_t *ll) } r=safe_malloc(sizeof(*r), "init_log"); r->st=l; - r->log=log_multi; - r->vlog=log_vmulti; + r->vlogfn=log_vmulti; + r->buff[0]=0; return r; } @@ -261,11 +312,13 @@ static void logfile_vlog(void *sst, int class, const char *message, fflush(st->f); } } else { - vMessage(class,message,args); - Message(class,"\n"); + vMessageFallback(class,message,args); + MessageFallback(class,"\n"); } } +static void logfile_log(void *state, int class, const char *message, ...) + FORMAT(printf,3,4); static void logfile_log(void *state, int class, const char *message, ...) { va_list ap; @@ -338,8 +391,8 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context, st->cl.apply=NULL; st->cl.interface=&st->ops; st->ops.st=st; - st->ops.log=logfile_log; - st->ops.vlog=logfile_vlog; + st->ops.vlogfn=logfile_vlog; + st->ops.buff[0]=0; st->loc=loc; st->f=NULL; @@ -382,6 +435,9 @@ static int msgclass_to_syslogpriority(uint32_t m) } } +static void syslog_vlog(void *sst, int class, const char *message, + va_list args) + FORMAT(printf,3,0); static void syslog_vlog(void *sst, int class, const char *message, va_list args) { @@ -390,20 +446,11 @@ static void syslog_vlog(void *sst, int class, const char *message, if (st->open) vsyslog(msgclass_to_syslogpriority(class),message,args); else { - vMessage(class,message,args); - Message(class,"\n"); + vMessageFallback(class,message,args); + MessageFallback(class,"\n"); } } -static void syslog_log(void *sst, int priority, const char *message, ...) -{ - va_list ap; - - va_start(ap,message); - syslog_vlog(sst,priority,message,ap); - va_end(ap); -} - static struct flagstr syslog_facility_table[]={ #ifdef LOG_AUTH { "auth", LOG_AUTH }, @@ -455,8 +502,8 @@ static list_t *syslog_apply(closure_t *self, struct cloc loc, dict_t *context, st->cl.apply=NULL; st->cl.interface=&st->ops; st->ops.st=st; - st->ops.log=syslog_log; - st->ops.vlog=syslog_vlog; + st->ops.vlogfn=syslog_vlog; + st->ops.buff[0]=0; item=list_elem(args,0); if (!item || item->type!=t_dict) @@ -487,20 +534,20 @@ struct fdlog { }; static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_io, - int *timeout_io, - const struct timeval *tv_now, uint64_t *now) + int *timeout_io) { struct fdlog *st=sst; if (!st->finished) { - *nfds_io=1; + BEFOREPOLL_WANT_FDS(1); fds[0].fd=st->fd; fds[0].events=POLLIN; + } else { + BEFOREPOLL_WANT_FDS(0); } return 0; } -static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds, - const struct timeval *tv_now, uint64_t *now) +static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds) { struct fdlog *st=sst; int r,remain,i; @@ -513,7 +560,7 @@ static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds, remain=FDLOG_BUFSIZE-st->i-1; if (remain<=0) { st->buffer[FDLOG_BUFSIZE-1]=0; - st->log->log(st->log,M_WARNING,"%s: overlong line: %s", + slilog(st->log,M_WARNING,"%s: overlong line: %s", st->prefix,st->buffer); st->i=0; remain=FDLOG_BUFSIZE-1; @@ -524,7 +571,7 @@ static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds, for (i=0; ii; i++) { if (st->buffer[i]=='\n') { st->buffer[i]=0; - st->log->log(st->log->st,M_INFO,"%s: %s", + slilog(st->log,M_INFO,"%s: %s", st->prefix,st->buffer); i++; memmove(st->buffer,st->buffer+i,st->i-i); @@ -532,6 +579,7 @@ static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds, i=-1; } } + } else if (errno==EINTR || iswouldblock(errno)) { } else { Message(M_WARNING,"log_from_fd: %s\n",strerror(errno)); st->finished=True; @@ -551,11 +599,12 @@ void log_from_fd(int fd, cstring_t prefix, struct log_if *log) st->i=0; st->finished=False; - register_for_poll(st,log_from_fd_beforepoll,log_from_fd_afterpoll,1, + setnonblock(st->fd); + + register_for_poll(st,log_from_fd_beforepoll,log_from_fd_afterpoll, prefix); } -init_module log_module; void log_module(dict_t *dict) { add_closure(dict,"logfile",logfile_apply);