X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=log.c;h=f3b5cbde7a3dd1f611aff40b4ea4a74ebaf1e6e7;hb=686e21aa2afbd14c3e59962f02a31c4dcd62e5d8;hp=a2e24aed61e1fd37669648f46519cc6f3ce896b7;hpb=952f601f3501b0e40083f5d1a6ef166b8b62a813;p=secnet.git

diff --git a/log.c b/log.c
index a2e24ae..f3b5cbd 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,15 +45,11 @@ 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)
 {
 
-    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, ...)
@@ -48,8 +61,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 +74,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 +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);
 
@@ -134,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);
 }
 
@@ -143,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);
 }    
 
@@ -152,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);
@@ -175,6 +196,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 +211,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)
 {
@@ -288,12 +311,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)
 {
@@ -309,27 +334,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;
@@ -343,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 "
@@ -359,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);
@@ -391,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)
 {
@@ -403,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) {
@@ -420,7 +449,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");
 
@@ -627,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);
 }