X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=log.c;h=67b43350e127bb86de07f994ee0ba854bfebc07e;hb=7c4bade1c4dc20a01314b82cecad85509655a251;hp=d5669ca6708010a97e14c2e6568e06b021c3c56f;hpb=24eb6b672f1095d5b362b6615f22c17f1136274a;p=secnet.git

diff --git a/log.c b/log.c
index d5669ca..67b4335 100644
--- a/log.c
+++ b/log.c
@@ -330,7 +330,7 @@ static void logfile_vlog(void *sst, int class, const char *message,
 	pidbuf[0]=0;
     }
 
-    if (secnet_is_daemon && st->f) {
+    if (secnet_is_daemon) {
 	if (class&st->level) {
 	    t=time(NULL);
 	    tm=localtime(&t);
@@ -363,6 +363,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 "
@@ -379,7 +380,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);
@@ -431,7 +432,7 @@ 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->forked=0;
 
     item=list_elem(args,0);
@@ -440,7 +441,7 @@ 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->level=string_list_to_word(dict_lookup(dict,"class"),
 				       message_class_table,"logfile");
 
@@ -649,6 +650,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);
 }