X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=log.c;h=a2e24aed61e1fd37669648f46519cc6f3ce896b7;hp=156f3549df18c23c481cc017f587ea96b475be79;hb=4b478582d7ab079f0701ee18a7760582ecda618b;hpb=f1393100aa5412f0df5ee363c6bdd42b2465fa59

diff --git a/log.c b/log.c
index 156f354..a2e24ae 100644
--- a/log.c
+++ b/log.c
@@ -225,6 +225,23 @@ void lg_perror(struct log_if *lg, const char *desc, struct cloc *loc,
     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)
 {
     int i=0;
@@ -249,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;
@@ -257,7 +274,7 @@ struct log_if *init_log(list_t *ll)
     if (!l) {
 	fatal("init_log: no log");
     }
-    r=safe_malloc(sizeof(*r), "init_log");
+    NEW(r);
     r->st=l;
     r->vlogfn=log_vmulti;
     r->buff[0]=0;
@@ -271,6 +288,7 @@ struct logfile {
     string_t logfile;
     uint32_t level;
     FILE *f;
+    bool_t forked;
 };
 
 static cstring_t months[]={
@@ -282,19 +300,29 @@ 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 {
+	if (pidbuf[0]) MessageFallback(class,"%s",pidbuf);
 	vMessageFallback(class,message,args);
 	MessageFallback(class,"\n");
     }
@@ -340,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 },
@@ -368,7 +402,7 @@ 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;
@@ -378,6 +412,7 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context,
     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) {
@@ -390,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);
 }
@@ -466,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;
     }
 }
@@ -479,7 +517,7 @@ 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;
@@ -499,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);
 }    
@@ -562,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;
@@ -573,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;
@@ -581,6 +621,8 @@ void log_from_fd(int fd, cstring_t prefix, struct log_if *log)
     st->i=0;
     st->finished=False;
 
+    setnonblock(st->fd);
+
     register_for_poll(st,log_from_fd_beforepoll,log_from_fd_afterpoll,
 		      prefix);
 }