X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=log.c;h=f4ef8000605c866121031ecb4babf2965c2aa1ff;hp=dd51b25984028a513f7308c9da3d9bc139f7f104;hb=59938e0ed0c8ac267c3715a25a0a3ed27f7a7e47;hpb=8dea8d37a13fcc615daba3375809900f04a2e5a2 diff --git a/log.c b/log.c index dd51b25..f4ef800 100644 --- a/log.c +++ b/log.c @@ -5,13 +5,16 @@ #include #include #include +#include +#include #include "process.h" +#include "util.h" bool_t secnet_is_daemon=False; -uint32_t message_level=M_WARNING|M_ERROR|M_SECURITY|M_FATAL; +uint32_t message_level=M_WARNING|M_ERR|M_SECURITY|M_FATAL; struct log_if *system_log=NULL; -static void vMessage(uint32_t class, char *message, va_list args) +static void vMessage(uint32_t class, const char *message, va_list args) { FILE *dest=stdout; #define MESSAGE_BUFLEN 1023 @@ -26,13 +29,13 @@ static void vMessage(uint32_t class, char *message, va_list args) /* Each line is sent separately */ while ((nlp=strchr(buff,'\n'))) { *nlp=0; - log(system_log,class,buff); + slilog(system_log,class,buff); memmove(buff,nlp+1,strlen(nlp+1)+1); } } else { /* Messages go to stdout/stderr */ if (class & message_level) { - if (class&M_FATAL || class&M_ERROR || class&M_WARNING) { + if (class&M_FATAL || class&M_ERR || class&M_WARNING) { dest=stderr; } vfprintf(dest,message,args); @@ -40,7 +43,7 @@ static void vMessage(uint32_t class, char *message, va_list args) } } -void Message(uint32_t class, char *message, ...) +void Message(uint32_t class, const char *message, ...) { va_list ap; @@ -49,26 +52,27 @@ void Message(uint32_t class, char *message, ...) va_end(ap); } -static void vfatal(int status, bool_t perror, char *message, va_list args) +static NORETURN(vfatal(int status, bool_t perror, const char *message, + va_list args)); + +static void vfatal(int status, bool_t perror, const char *message, + va_list args) { int err; err=errno; enter_phase(PHASE_SHUTDOWN); - if (perror) { - Message(M_FATAL, "secnet fatal error: "); - vMessage(M_FATAL, message, args); + Message(M_FATAL, "secnet fatal error: "); + vMessage(M_FATAL, message, args); + if (perror) Message(M_FATAL, ": %s\n",strerror(err)); - } - else { - Message(M_FATAL, "secnet fatal error: "); - vMessage(M_FATAL,message,args); - } + else + Message(M_FATAL, "\n"); exit(status); } -void fatal(char *message, ...) +void fatal(const char *message, ...) { va_list args; va_start(args,message); @@ -76,7 +80,7 @@ void fatal(char *message, ...) va_end(args); } -void fatal_status(int status, char *message, ...) +void fatal_status(int status, const char *message, ...) { va_list args; va_start(args,message); @@ -84,7 +88,7 @@ void fatal_status(int status, char *message, ...) va_end(args); } -void fatal_perror(char *message, ...) +void fatal_perror(const char *message, ...) { va_list args; va_start(args,message); @@ -92,7 +96,7 @@ void fatal_perror(char *message, ...) va_end(args); } -void fatal_perror_status(int status, char *message, ...) +void fatal_perror_status(int status, const char *message, ...) { va_list args; va_start(args,message); @@ -100,15 +104,20 @@ void fatal_perror_status(int status, char *message, ...) va_end(args); } -void cfgfatal(struct cloc loc, string_t facility, char *message, ...) +void vcfgfatal_maybefile(FILE *maybe_f /* or 0 */, struct cloc loc, + cstring_t facility, const char *message, va_list args) { - va_list args; - - va_start(args,message); - enter_phase(PHASE_SHUTDOWN); - if (loc.file && loc.line) { + if (maybe_f && ferror(maybe_f)) { + assert(loc.file); + Message(M_FATAL, "error reading config file (%s, %s): %s", + facility, loc.file, strerror(errno)); + } else if (maybe_f && feof(maybe_f)) { + assert(loc.file); + Message(M_FATAL, "unexpected end of config file (%s, %s)", + facility, loc.file); + } else if (loc.file && loc.line) { Message(M_FATAL, "config error (%s, %s:%d): ",facility,loc.file, loc.line); } else if (!loc.file && loc.line) { @@ -118,17 +127,48 @@ void cfgfatal(struct cloc loc, string_t facility, char *message, ...) } vMessage(M_FATAL,message,args); - va_end(args); exit(current_phase); } +void cfgfatal_maybefile(FILE *maybe_f, struct cloc loc, cstring_t facility, + const char *message, ...) +{ + va_list args; + + va_start(args,message); + vcfgfatal_maybefile(maybe_f,loc,facility,message,args); + va_end(args); +} + +void cfgfatal(struct cloc loc, cstring_t facility, const char *message, ...) +{ + va_list args; + + va_start(args,message); + vcfgfatal_maybefile(0,loc,facility,message,args); + va_end(args); +} + +void cfgfile_postreadcheck(struct cloc loc, FILE *f) +{ + assert(loc.file); + if (ferror(f)) { + Message(M_FATAL, "error reading config file (%s): %s", + loc.file, strerror(errno)); + exit(current_phase); + } else if (feof(f)) { + Message(M_FATAL, "unexpected end of config file (%s)", loc.file); + exit(current_phase); + } +} + /* Take a list of log closures and merge them */ struct loglist { struct log_if *l; struct loglist *next; }; -static void log_vmulti(void *sst, int class, char *message, va_list args) +static void log_vmulti(void *sst, int class, const char *message, va_list args) { struct loglist *st=sst, *i; @@ -142,7 +182,7 @@ static void log_vmulti(void *sst, int class, char *message, va_list args) } } -static void log_multi(void *st, int priority, char *message, ...) +static void log_multi(void *st, int priority, const char *message, ...) { va_list ap; @@ -199,16 +239,17 @@ struct logfile { FILE *f; }; -static string_t months[]={ +static cstring_t months[]={ "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"}; -static void logfile_vlog(void *sst, int class, char *message, va_list args) +static void logfile_vlog(void *sst, int class, const char *message, + va_list args) { struct logfile *st=sst; time_t t; struct tm *tm; - if (secnet_is_daemon) { + if (secnet_is_daemon && st->f) { if (class&st->level) { t=time(NULL); tm=localtime(&t); @@ -225,12 +266,12 @@ static void logfile_vlog(void *sst, int class, char *message, va_list args) } } -static void logfile_log(void *state, int priority, char *message, ...) +static void logfile_log(void *state, int class, const char *message, ...) { va_list ap; va_start(ap,message); - logfile_vlog(state,priority,message,ap); + logfile_vlog(state,class,message,ap); va_end(ap); } @@ -271,11 +312,11 @@ static struct flagstr message_class_table[]={ { "info", M_INFO }, { "notice", M_NOTICE }, { "warning", M_WARNING }, - { "error", M_ERROR }, + { "error", M_ERR }, { "security", M_SECURITY }, { "fatal", M_FATAL }, - { "default", M_WARNING|M_ERROR|M_SECURITY|M_FATAL }, - { "verbose", M_INFO|M_NOTICE|M_WARNING|M_ERROR|M_SECURITY|M_FATAL }, + { "default", M_WARNING|M_ERR|M_SECURITY|M_FATAL }, + { "verbose", M_INFO|M_NOTICE|M_WARNING|M_ERR|M_SECURITY|M_FATAL }, { "quiet", M_FATAL }, { NULL, 0 } }; @@ -300,7 +341,7 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context, st->ops.log=logfile_log; st->ops.vlog=logfile_vlog; st->loc=loc; - st->f=stderr; + st->f=NULL; item=list_elem(args,0); if (!item || item->type!=t_dict) { @@ -334,14 +375,14 @@ static int msgclass_to_syslogpriority(uint32_t m) case M_INFO: return LOG_INFO; case M_NOTICE: return LOG_NOTICE; case M_WARNING: return LOG_WARNING; - case M_ERROR: return LOG_ERR; + case M_ERR: return LOG_ERR; case M_SECURITY: return LOG_CRIT; case M_FATAL: return LOG_EMERG; default: return LOG_NOTICE; } } -static void syslog_vlog(void *sst, int class, char *message, +static void syslog_vlog(void *sst, int class, const char *message, va_list args) { struct syslog *st=sst; @@ -354,7 +395,7 @@ static void syslog_vlog(void *sst, int class, char *message, } } -static void syslog_log(void *sst, int priority, char *message, ...) +static void syslog_log(void *sst, int priority, const char *message, ...) { va_list ap; @@ -432,7 +473,88 @@ static list_t *syslog_apply(closure_t *self, struct cloc loc, dict_t *context, return new_closure(&st->cl); } -init_module log_module; +/* Read from a fd and output to a log. This is a quick hack to + support logging stderr, and needs code adding to tidy up before it + can be used for anything else. */ +#define FDLOG_BUFSIZE 1024 +struct fdlog { + struct log_if *log; + int fd; + cstring_t prefix; + string_t buffer; + int i; + bool_t finished; +}; + +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) +{ + struct fdlog *st=sst; + if (!st->finished) { + *nfds_io=1; + fds[0].fd=st->fd; + fds[0].events=POLLIN; + } + return 0; +} + +static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds, + const struct timeval *tv_now, uint64_t *now) +{ + struct fdlog *st=sst; + int r,remain,i; + + if (nfds==0) return; + if (fds[0].revents&POLLERR) { + st->finished=True; + } + if (fds[0].revents&POLLIN) { + 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", + st->prefix,st->buffer); + st->i=0; + remain=FDLOG_BUFSIZE-1; + } + r=read(st->fd,st->buffer+st->i,remain); + if (r>0) { + st->i+=r; + for (i=0; ii; i++) { + if (st->buffer[i]=='\n') { + st->buffer[i]=0; + st->log->log(st->log->st,M_INFO,"%s: %s", + st->prefix,st->buffer); + i++; + memmove(st->buffer,st->buffer+i,st->i-i); + st->i-=i; + i=-1; + } + } + } else { + Message(M_WARNING,"log_from_fd: %s\n",strerror(errno)); + st->finished=True; + } + } +} + +void log_from_fd(int fd, cstring_t prefix, struct log_if *log) +{ + struct fdlog *st; + + st=safe_malloc(sizeof(*st),"log_from_fd"); + st->log=log; + st->fd=fd; + st->prefix=prefix; + st->buffer=safe_malloc(FDLOG_BUFSIZE,"log_from_fd"); + st->i=0; + st->finished=False; + + register_for_poll(st,log_from_fd_beforepoll,log_from_fd_afterpoll,1, + prefix); +} + void log_module(dict_t *dict) { add_closure(dict,"logfile",logfile_apply);