X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=log.c;h=f937d2ec35d4500294d568d43da2e4258ed3512e;hb=147b444d6faa9a621e33d653b7a72c29724203c3;hp=d5669ca6708010a97e14c2e6568e06b021c3c56f;hpb=3a2c5e1f10dc6b3cc86f74c287d8c14be14d7e80;p=secnet.git diff --git a/log.c b/log.c index d5669ca..f937d2e 100644 --- a/log.c +++ b/log.c @@ -49,12 +49,7 @@ FORMAT(printf,2,0) static void vMessage(uint32_t class, const char *message, va_list args) { - if (system_log) { - /* Messages go to the system log interface */ - vslilog_part(system_log, class, message, args); - } else { - vMessageFallback(class,message,args); - } + vslilog_part(system_log, class, message, args); } void Message(uint32_t class, const char *message, ...) @@ -130,7 +125,8 @@ void fatal_perror_status(int status, const char *message, ...) } void vcfgfatal_maybefile(FILE *maybe_f /* or 0 */, struct cloc loc, - cstring_t facility, const char *message, va_list args) + cstring_t facility, const char *message, va_list args, + const char *suffix) { enter_phase(PHASE_SHUTDOWN); @@ -152,6 +148,7 @@ void vcfgfatal_maybefile(FILE *maybe_f /* or 0 */, struct cloc loc, } vMessage(M_FATAL,message,args); + Message(M_FATAL,"%s",suffix); exit(current_phase); } @@ -161,7 +158,7 @@ void cfgfatal_maybefile(FILE *maybe_f, struct cloc loc, cstring_t facility, va_list args; va_start(args,message); - vcfgfatal_maybefile(maybe_f,loc,facility,message,args); + vcfgfatal_maybefile(maybe_f,loc,facility,message,args,0); va_end(args); } @@ -170,10 +167,16 @@ 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); + vcfgfatal_maybefile(0,loc,facility,message,args,""); va_end(args); } +void cfgfile_log__vmsg(void *sst, int class, const char *message, va_list args) +{ + struct cfgfile_log *st=sst; + vcfgfatal_maybefile(0,st->loc,st->facility,message,args,"\n"); +} + void cfgfile_postreadcheck(struct cloc loc, FILE *f) { assert(loc.file); @@ -308,6 +311,7 @@ struct logfile { string_t logfile; uint32_t level; FILE *f; + const char *prefix; bool_t forked; }; @@ -330,22 +334,17 @@ static void logfile_vlog(void *sst, int class, const char *message, pidbuf[0]=0; } - if (secnet_is_daemon && st->f) { - if (class&st->level) { - t=time(NULL); - tm=localtime(&t); - fprintf(st->f,"%s %2d %02d:%02d:%02d %s", - months[tm->tm_mon],tm->tm_mday,tm->tm_hour,tm->tm_min, - tm->tm_sec, - pidbuf); - vfprintf(st->f,message,args); - fprintf(st->f,"\n"); - fflush(st->f); - } - } else { - if (pidbuf[0]) MessageFallback(class,"%s",pidbuf); - vMessageFallback(class,message,args); - MessageFallback(class,"\n"); + if (class&st->level) { + t=time(NULL); + tm=localtime(&t); + fprintf(st->f,"%s %2d %02d:%02d:%02d %s%s%s", + months[tm->tm_mon],tm->tm_mday,tm->tm_hour,tm->tm_min, + tm->tm_sec, + st->prefix, st->prefix[0] ? " " : "", + pidbuf); + vfprintf(st->f,message,args); + fprintf(st->f,"\n"); + fflush(st->f); } } @@ -363,6 +362,7 @@ static void logfile_hup_notify(void *sst, int signum) { struct logfile *st=sst; FILE *f; + if (!st->logfile) return; f=fopen(st->logfile,"a"); if (!f) { logfile_log(st,M_FATAL,"received SIGHUP, but could not reopen " @@ -379,7 +379,7 @@ static void logfile_phase_hook(void *sst, uint32_t new_phase) struct logfile *st=sst; FILE *f; - if (background) { + if (background && st->logfile) { f=fopen(st->logfile,"a"); if (!f) fatal_perror("logfile (%s:%d): cannot open \"%s\"", st->loc.file,st->loc.line,st->logfile); @@ -411,6 +411,23 @@ static struct flagstr message_class_table[]={ { NULL, 0 } }; +static void logfile_file_init(struct logfile *st, FILE *f, const char *desc) +{ + st->cl.description=desc; + st->cl.type=CL_LOG; + st->cl.apply=NULL; + st->cl.interface=&st->ops; + st->ops.st=st; + st->ops.vlogfn=logfile_vlog; + st->ops.buff[0]=0; + st->f=f; + st->logfile=0; + st->prefix=""; + st->forked=0; + st->loc.file=0; + st->loc.line=-1; +} + static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context, list_t *args) { @@ -423,16 +440,8 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context, become a daemon. */ NEW(st); - st->cl.description="logfile"; - st->cl.type=CL_LOG; - st->cl.apply=NULL; - st->cl.interface=&st->ops; - st->ops.st=st; - st->ops.vlogfn=logfile_vlog; - st->ops.buff[0]=0; st->loc=loc; - st->f=NULL; - st->forked=0; + logfile_file_init(st,stderr,"logfile"); item=list_elem(args,0); if (!item || item->type!=t_dict) { @@ -440,11 +449,13 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context, } dict=item->data.dict; - st->logfile=dict_read_string(dict,"filename",True,"logfile",loc); + st->logfile=dict_read_string(dict,"filename",False,"logfile",loc); + st->prefix=dict_read_string(dict,"prefix",False,"logfile",loc); + if (!st->prefix) st->prefix=""; st->level=string_list_to_word(dict_lookup(dict,"class"), message_class_table,"logfile"); - add_hook(PHASE_GETRESOURCES,logfile_phase_hook,st); + add_hook(PHASE_DAEMONIZE,logfile_phase_hook,st); add_hook(PHASE_CHILDPERSIST,logfile_childpersist_hook,st); return new_closure(&st->cl); @@ -556,7 +567,7 @@ static list_t *syslog_apply(closure_t *self, struct cloc loc, dict_t *context, st->facility=string_to_word(facstr,loc, syslog_facility_table,"syslog"); st->open=False; - add_hook(PHASE_GETRESOURCES,syslog_phase_hook,st); + add_hook(PHASE_DAEMONIZE,syslog_phase_hook,st); add_hook(PHASE_CHILDPERSIST,syslog_phase_hook,st); return new_closure(&st->cl); @@ -647,8 +658,20 @@ void log_from_fd(int fd, cstring_t prefix, struct log_if *log) prefix); } +static struct logfile startup_log; +void log_early_init(void) +{ + logfile_file_init(&startup_log,stderr,"startup"); + system_log=&startup_log.ops;; +} + +/* for the benefit of main, really */ +void logfile_init_file(struct logfile *st, FILE *f); + void log_module(dict_t *dict) { + setlinebuf(stderr); + add_closure(dict,"logfile",logfile_apply); add_closure(dict,"syslog",syslog_apply); }