}
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);
}
vMessage(M_FATAL,message,args);
+ Message(M_FATAL,"%s",suffix);
exit(current_phase);
}
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);
}
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);
string_t logfile;
uint32_t level;
FILE *f;
+ const char *prefix;
bool_t forked;
};
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);
}
}
{
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 "
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);
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);
}
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");
void log_module(dict_t *dict)
{
+ setlinebuf(stderr);
+
add_closure(dict,"logfile",logfile_apply);
add_closure(dict,"syslog",syslog_apply);
}