static void vMessage(uint32_t class, const char *message, va_list args)
{
-#define MESSAGE_BUFLEN 1023
- static char buff[MESSAGE_BUFLEN+1]={0,};
- size_t bp;
- char *nlp;
if (system_log) {
/* Messages go to the system log interface */
- bp=strlen(buff);
- assert(bp < MESSAGE_BUFLEN);
- vsnprintf(buff+bp,MESSAGE_BUFLEN-bp,message,args);
- buff[sizeof(buff)-2] = '\n';
- buff[sizeof(buff)-1] = '\0';
- /* Each line is sent separately */
- while ((nlp=strchr(buff,'\n'))) {
- *nlp=0;
- slilog(system_log,class,"%s",buff);
- memmove(buff,nlp+1,strlen(nlp+1)+1);
- }
+ vslilog_part(system_log, class, message, args);
} else {
vMessageFallback(class,message,args);
}
}
}
-static void log_multi(void *st, int priority, const char *message, ...)
- FORMAT(printf,3,4);
-static void log_multi(void *st, int priority, const char *message, ...)
+void lg_vperror(struct log_if *lg, const char *desc, struct cloc *loc,
+ int class, int errnoval, const char *fmt, va_list al)
{
- va_list ap;
+ int status=current_phase;
+ int esave=errno;
- va_start(ap,message);
- log_vmulti(st,priority,message,ap);
- va_end(ap);
+ if (!lg)
+ lg=system_log;
+
+ if (class & M_FATAL)
+ enter_phase(PHASE_SHUTDOWN);
+
+ slilog_part(lg,class,"%s",desc);
+ if (loc)
+ slilog_part(lg,class," (%s:%d)",loc->file,loc->line);
+ slilog_part(lg,class,": ");
+ vslilog_part(lg,class,fmt,al);
+ if (errnoval)
+ slilog_part(lg,class,": %s",strerror(errnoval));
+ slilog_part(lg,class,"\n");
+
+ if (class & M_FATAL)
+ exit(status);
+
+ errno=esave;
+}
+
+void lg_perror(struct log_if *lg, const char *desc, struct cloc *loc,
+ int class, int errnoval, const char *fmt, ...)
+{
+ va_list al;
+ va_start(al,fmt);
+ lg_vperror(lg,desc,loc,class,errnoval,fmt,al);
+ va_end(al);
+}
+
+void lg_exitstatus(struct log_if *lg, const char *desc, struct cloc *loc,
+ int class, int status, const char *progname)
+{
+ if (!status)
+ lg_perror(lg,desc,loc,class,0,"%s exited",progname);
+ else if (WIFEXITED(status))
+ lg_perror(lg,desc,loc,class,0,"%s exited with error exit status %d",
+ progname,WEXITSTATUS(status));
+ else if (WIFSIGNALED(status))
+ lg_perror(lg,desc,loc,class,0,"%s died due to fatal signal %s (%d)%s",
+ progname,strsignal(WTERMSIG(status)),WTERMSIG(status),
+ WCOREDUMP(status)?" (core dumped)":"");
+ else
+ lg_perror(lg,desc,loc,class,0,"%s died with unknown wait status %d",
+ progname,status);
}
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;
if (!l) {
fatal("init_log: no log");
}
- r=safe_malloc(sizeof(*r), "init_log");
+ NEW(r);
r->st=l;
- r->logfn=log_multi;
r->vlogfn=log_vmulti;
+ r->buff[0]=0;
return r;
}
string_t logfile;
uint32_t level;
FILE *f;
+ bool_t forked;
};
static cstring_t months[]={
struct logfile *st=sst;
time_t t;
struct tm *tm;
+ char pidbuf[20];
+
+ if (st->forked) {
+ pid_t us=getpid();
+ snprintf(pidbuf,sizeof(pidbuf),"[%ld] ",(long)us);
+ } else {
+ 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 ",
+ 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);
+ 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");
}
}
}
+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 },
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;
st->cl.interface=&st->ops;
st->ops.st=st;
- st->ops.logfn=logfile_log;
st->ops.vlogfn=logfile_vlog;
+ st->ops.buff[0]=0;
st->loc=loc;
st->f=NULL;
+ st->forked=0;
item=list_elem(args,0);
if (!item || item->type!=t_dict) {
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);
}
}
}
-static void syslog_log(void *sst, int priority, const char *message, ...)
- FORMAT(printf,3,4);
-static void syslog_log(void *sst, int priority, const char *message, ...)
-{
- va_list ap;
-
- va_start(ap,message);
- syslog_vlog(sst,priority,message,ap);
- va_end(ap);
-}
-
static struct flagstr syslog_facility_table[]={
#ifdef LOG_AUTH
{ "auth", LOG_AUTH },
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;
}
}
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;
st->cl.interface=&st->ops;
st->ops.st=st;
- st->ops.logfn=syslog_log;
st->ops.vlogfn=syslog_vlog;
+ st->ops.buff[0]=0;
item=list_elem(args,0);
if (!item || item->type!=t_dict)
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);
}
{
struct fdlog *st=sst;
if (!st->finished) {
- *nfds_io=1;
+ BEFOREPOLL_WANT_FDS(1);
fds[0].fd=st->fd;
fds[0].events=POLLIN;
+ } else {
+ BEFOREPOLL_WANT_FDS(0);
}
return 0;
}
i=-1;
}
}
+ } else if (errno==EINTR || iswouldblock(errno)) {
} else {
Message(M_WARNING,"log_from_fd: %s\n",strerror(errno));
st->finished=True;
{
struct fdlog *st;
- st=safe_malloc(sizeof(*st),"log_from_fd");
+ NEW(st);
st->log=log;
st->fd=fd;
st->prefix=prefix;
st->i=0;
st->finished=False;
- register_for_poll(st,log_from_fd_beforepoll,log_from_fd_afterpoll,1,
+ setnonblock(st->fd);
+
+ register_for_poll(st,log_from_fd_beforepoll,log_from_fd_afterpoll,
prefix);
}
~ian / secnet.git / blobdiff