X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=log.c;h=123961202abd5f42faacb0d987779bd612c26d91;hb=1b8af2f7f86131a5364f2270865895ea597c591e;hp=ddc2524ee4034c1a11f461c769fe55c271d58f73;hpb=c215a4bc817daf7b5631236c3c7b6a509479b034;p=secnet.git

diff --git a/log.c b/log.c
index ddc2524..1239612 100644
--- a/log.c
+++ b/log.c
@@ -4,7 +4,7 @@
  *
  * 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 d of the License, or
+ * 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
@@ -32,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;
@@ -46,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)
 {
 
@@ -66,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;
@@ -80,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)
 {
@@ -193,6 +193,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;
@@ -207,6 +208,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)
 {
@@ -306,12 +308,14 @@ 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)
 {
@@ -327,27 +331,21 @@ 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);
     }
 }
 
-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;
@@ -361,6 +359,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 "
@@ -377,7 +376,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);
@@ -429,7 +428,8 @@ 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);
@@ -438,7 +438,9 @@ 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");
 
@@ -647,6 +649,8 @@ void log_from_fd(int fd, cstring_t prefix, struct log_if *log)
 
 void log_module(dict_t *dict)
 {
+    setlinebuf(stderr);
+
     add_closure(dict,"logfile",logfile_apply);
     add_closure(dict,"syslog",syslog_apply);
 }