X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=log.c;h=3efd289fe67f9efc9051a07c84a2f83b58a06b51;hb=b65782b25170087bef9556729d7168395770b42b;hp=3748f9157d15dc7778847201c0eaed777f39fdc5;hpb=45736f7396593c2f4ef9ebf35c561e7a32111f63;p=secnet.git

diff --git a/log.c b/log.c
index 3748f91..3efd289 100644
--- a/log.c
+++ b/log.c
@@ -1,3 +1,21 @@
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
 #include "secnet.h"
 #include <stdio.h>
 #include <string.h>
@@ -14,8 +32,7 @@ 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 vMessageFallback(uint32_t class, const char *message, va_list args)
-    FORMAT(printf,2,0);
+FORMAT(printf,2,0)
 static void vMessageFallback(uint32_t class, const char *message, va_list args)
 {
     FILE *dest=stdout;
@@ -28,6 +45,7 @@ static void vMessageFallback(uint32_t class, const char *message, va_list args)
     }
 }
 
+FORMAT(printf,2,0)
 static void vMessage(uint32_t class, const char *message, va_list args)
 {
 
@@ -48,8 +66,7 @@ void Message(uint32_t class, const char *message, ...)
     va_end(ap);
 }
 
-static void MessageFallback(uint32_t class, const char *message, ...)
-    FORMAT(printf,2,3);
+FORMAT(printf,2,3)
 static void MessageFallback(uint32_t class, const char *message, ...)
 {
     va_list ap;
@@ -62,6 +79,7 @@ static void MessageFallback(uint32_t class, const char *message, ...)
 static NORETURN(vfatal(int status, bool_t perror, const char *message,
 		       va_list args));
 
+FORMAT(printf,3,0)
 static void vfatal(int status, bool_t perror, const char *message,
 		   va_list args)
 {
@@ -112,7 +130,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);
 
@@ -134,6 +153,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);
 }
 
@@ -143,7 +163,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);
 }    
 
@@ -152,10 +172,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);
@@ -175,6 +201,7 @@ struct loglist {
     struct loglist *next;
 };
 
+FORMAT(printf, 3, 0)
 static void log_vmulti(void *sst, int class, const char *message, va_list args)
 {
     struct loglist *st=sst, *i;
@@ -189,6 +216,7 @@ static void log_vmulti(void *sst, int class, const char *message, va_list args)
     }
 }
 
+FORMAT(printf, 6, 0)
 void lg_vperror(struct log_if *lg, const char *desc, struct cloc *loc,
 		int class, int errnoval, const char *fmt, va_list al)
 {
@@ -266,7 +294,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;
@@ -274,7 +302,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;
@@ -288,37 +316,44 @@ struct logfile {
     string_t logfile;
     uint32_t level;
     FILE *f;
+    const char *prefix;
+    bool_t forked;
 };
 
 static cstring_t months[]={
     "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
 
+FORMAT(printf, 3, 0)
 static void logfile_vlog(void *sst, int class, const char *message,
 			 va_list args)
 {
     struct logfile *st=sst;
     time_t t;
     struct tm *tm;
+    char pidbuf[20];
 
-    if (secnet_is_daemon && st->f) {
-	if (class&st->level) {
-	    t=time(NULL);
-	    tm=localtime(&t);
-	    fprintf(st->f,"%s %2d %02d:%02d:%02d ",
-		    months[tm->tm_mon],tm->tm_mday,tm->tm_hour,tm->tm_min,
-		    tm->tm_sec);
-	    vfprintf(st->f,message,args);
-	    fprintf(st->f,"\n");
-	    fflush(st->f);
-	}
+    if (st->forked) {
+	pid_t us=getpid();
+	snprintf(pidbuf,sizeof(pidbuf),"[%ld] ",(long)us);
     } else {
-	vMessageFallback(class,message,args);
-	MessageFallback(class,"\n");
+	pidbuf[0]=0;
+    }
+
+    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);
     }
 }
 
-static void logfile_log(void *state, int class, const char *message, ...)
-    FORMAT(printf,3,4);
+FORMAT(printf,3,4)
 static void logfile_log(void *state, int class, const char *message, ...)
 {
     va_list ap;
@@ -332,6 +367,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 "
@@ -348,7 +384,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);
@@ -357,6 +393,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 },
@@ -385,7 +427,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;
@@ -394,7 +436,9 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context,
     st->ops.vlogfn=logfile_vlog;
     st->ops.buff[0]=0;
     st->loc=loc;
-    st->f=NULL;
+    st->f=stderr;
+    st->prefix="";
+    st->forked=0;
 
     item=list_elem(args,0);
     if (!item || item->type!=t_dict) {
@@ -402,11 +446,14 @@ 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_CHILDPERSIST,logfile_childpersist_hook,st);
 
     return new_closure(&st->cl);
 }
@@ -483,7 +530,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;
     }
 }
@@ -496,7 +545,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;
@@ -516,6 +565,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);
 }    
@@ -579,6 +629,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;
@@ -590,7 +641,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;
@@ -598,12 +649,16 @@ 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);
 }
 
 void log_module(dict_t *dict)
 {
+    setlinebuf(stderr);
+
     add_closure(dict,"logfile",logfile_apply);
     add_closure(dict,"syslog",syslog_apply);
 }