X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=log.c;h=a17032bb3e255ea8db651b7cb5afd8eaa0fc62ec;hp=6f4b7380198e7ad37dbf367d36b43b39a704e979;hb=b7886fd46ab05c97b8a072e497903622bd1d5290;hpb=90a39563035b70196da9c5bdc7c17a63b64449b0

diff --git a/log.c b/log.c
index 6f4b738..a17032b 100644
--- a/log.c
+++ b/log.c
@@ -14,33 +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,};
-    size_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);
-	assert(bp < MESSAGE_BUFLEN);
-	vsnprintf(buff+bp,MESSAGE_BUFLEN-bp,message,args);
-	/* Each line is sent separately */
-	while ((nlp=strchr(buff,'\n'))) {
-	    *nlp=0;
-	    slilog(system_log,class,"%s",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);
     }
 }  
 
@@ -53,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));
 
@@ -154,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);
     }
 }
@@ -175,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);
@@ -183,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)
@@ -216,7 +266,7 @@ struct log_if *init_log(list_t *ll)
 	if (cl->type!=CL_LOG) {
 	    cfgfatal(item->loc,"init_log","closure is not a logger");
 	}
-	n=safe_malloc(sizeof(*n),"init_log");
+	NEW(n);
 	n->l=cl->interface;
 	n->next=l;
 	l=n;
@@ -226,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;
 }
 
@@ -238,6 +288,7 @@ struct logfile {
     string_t logfile;
     uint32_t level;
     FILE *f;
+    bool_t forked;
 };
 
 static cstring_t months[]={
@@ -249,24 +300,36 @@ static void logfile_vlog(void *sst, int class, const char *message,
     struct logfile *st=sst;
     time_t t;
     struct tm *tm;
+    char pidbuf[20];
+
+    if (st->forked) {
+	pid_t us=getpid();
+	snprintf(pidbuf,sizeof(pidbuf),"[%ld] ",(long)us);
+    } else {
+	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 ",
+	    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);
+		    tm->tm_sec,
+		    pidbuf);
 	    vfprintf(st->f,message,args);
 	    fprintf(st->f,"\n");
 	    fflush(st->f);
 	}
     } else {
-	vMessage(class,message,args);
-	Message(class,"\n");
+	if (pidbuf[0]) MessageFallback(class,"%s",pidbuf);
+	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;
@@ -305,6 +368,12 @@ static void logfile_phase_hook(void *sst, uint32_t new_phase)
     }
 }
 
+static void logfile_childpersist_hook(void *sst, uint32_t new_phase)
+{
+    struct logfile *st=sst;
+    st->forked=1;
+}
+
 static struct flagstr message_class_table[]={
     { "debug-config", M_DEBUG_CONFIG },
     { "debug-phase", M_DEBUG_PHASE },
@@ -333,16 +402,17 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context,
        phase.  We should defer writing into the logfile until after we
        become a daemon. */
     
-    st=safe_malloc(sizeof(*st),"logfile_apply");
+    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.log=logfile_log;
-    st->ops.vlog=logfile_vlog;
+    st->ops.vlogfn=logfile_vlog;
+    st->ops.buff[0]=0;
     st->loc=loc;
     st->f=NULL;
+    st->forked=0;
 
     item=list_elem(args,0);
     if (!item || item->type!=t_dict) {
@@ -355,6 +425,7 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context,
 				       message_class_table,"logfile");
 
     add_hook(PHASE_GETRESOURCES,logfile_phase_hook,st);
+    add_hook(PHASE_CHILDPERSIST,logfile_childpersist_hook,st);
 
     return new_closure(&st->cl);
 }
@@ -383,6 +454,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)
 {
@@ -391,20 +465,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 },
@@ -437,7 +502,9 @@ static void syslog_phase_hook(void *sst, uint32_t newphase)
     struct syslog *st=sst;
 
     if (background) {
-	openlog(st->ident,0,st->facility);
+	openlog(st->ident,
+		newphase==PHASE_CHILDPERSIST ? LOG_PID : 0,
+		st->facility);
 	st->open=True;
     }
 }
@@ -450,14 +517,14 @@ static list_t *syslog_apply(closure_t *self, struct cloc loc, dict_t *context,
     item_t *item;
     string_t facstr;
 
-    st=safe_malloc(sizeof(*st),"syslog_apply");
+    NEW(st);
     st->cl.description="syslog";
     st->cl.type=CL_LOG;
     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)
@@ -470,6 +537,7 @@ static list_t *syslog_apply(closure_t *self, struct cloc loc, dict_t *context,
 				syslog_facility_table,"syslog");
     st->open=False;
     add_hook(PHASE_GETRESOURCES,syslog_phase_hook,st);
+    add_hook(PHASE_CHILDPERSIST,syslog_phase_hook,st);
 
     return new_closure(&st->cl);
 }    
@@ -492,9 +560,11 @@ static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_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;
 }
@@ -512,7 +582,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;
@@ -523,7 +593,7 @@ static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds)
 	    for (i=0; i<st->i; 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);
@@ -531,6 +601,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;
@@ -542,7 +613,7 @@ void log_from_fd(int fd, cstring_t prefix, struct log_if *log)
 {
     struct fdlog *st;
 
-    st=safe_malloc(sizeof(*st),"log_from_fd");
+    NEW(st);
     st->log=log;
     st->fd=fd;
     st->prefix=prefix;
@@ -550,7 +621,9 @@ 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);
 }