NEW etc.: Use NEW in all obvious places

[secnet.git] / log.c

diff --git a/log.c b/log.c
index 326a891955fed55f07a21d9db86fda216a12f1c9..a17032bb3e255ea8db651b7cb5afd8eaa0fc62ec 100644 (file)
--- a/log.c
+++ b/log.c
@@ -189,6 +189,59 @@ static void log_vmulti(void *sst, int class, const char *message, va_list args)
     }
 }
 
     }
 }
 

+void lg_vperror(struct log_if *lg, const char *desc, struct cloc *loc,
+               int class, int errnoval, const char *fmt, va_list al)
+{
+    int status=current_phase;
+    int esave=errno;
+
+    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)
 {
     int i=0;
 struct log_if *init_log(list_t *ll)
 {
     int i=0;


@@ -213,7 +266,7 @@ struct log_if *init_log(list_t *ll)
        if (cl->type!=CL_LOG) {
            cfgfatal(item->loc,"init_log","closure is not a logger");
        }
        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;
        n->l=cl->interface;
        n->next=l;
        l=n;


@@ -235,6 +288,7 @@ struct logfile {
     string_t logfile;
     uint32_t level;
     FILE *f;
     string_t logfile;
     uint32_t level;
     FILE *f;

+    bool_t forked;

 };
 
 static cstring_t months[]={
 };
 
 static cstring_t months[]={


@@ -246,19 +300,29 @@ static void logfile_vlog(void *sst, int class, const char *message,
     struct logfile *st=sst;
     time_t t;
     struct tm *tm;
     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);
 
     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,
                    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 {
            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");
     }
        vMessageFallback(class,message,args);
        MessageFallback(class,"\n");
     }


@@ -304,6 +368,12 @@ static void logfile_phase_hook(void *sst, uint32_t new_phase)
     }
 }
 
     }
 }
 

+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 },
 static struct flagstr message_class_table[]={
     { "debug-config", M_DEBUG_CONFIG },
     { "debug-phase", M_DEBUG_PHASE },


@@ -332,7 +402,7 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context,
        phase.  We should defer writing into the logfile until after we
        become a daemon. */
     
        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.description="logfile";
     st->cl.type=CL_LOG;
     st->cl.apply=NULL;


@@ -342,6 +412,7 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context,
     st->ops.buff[0]=0;
     st->loc=loc;
     st->f=NULL;
     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) {
 
     item=list_elem(args,0);
     if (!item || item->type!=t_dict) {


@@ -354,6 +425,7 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context,
                                       message_class_table,"logfile");
 
     add_hook(PHASE_GETRESOURCES,logfile_phase_hook,st);
                                       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);
 }
 
     return new_closure(&st->cl);
 }


@@ -430,7 +502,9 @@ static void syslog_phase_hook(void *sst, uint32_t newphase)
     struct syslog *st=sst;
 
     if (background) {
     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;
     }
 }
        st->open=True;
     }
 }


@@ -443,7 +517,7 @@ static list_t *syslog_apply(closure_t *self, struct cloc loc, dict_t *context,
     item_t *item;
     string_t facstr;
 
     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.description="syslog";
     st->cl.type=CL_LOG;
     st->cl.apply=NULL;


@@ -463,6 +537,7 @@ static list_t *syslog_apply(closure_t *self, struct cloc loc, dict_t *context,
                                syslog_facility_table,"syslog");
     st->open=False;
     add_hook(PHASE_GETRESOURCES,syslog_phase_hook,st);
                                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);
 }    
 
     return new_closure(&st->cl);
 }    


@@ -485,9 +560,11 @@ static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
 {
     struct fdlog *st=sst;
     if (!st->finished) {
 {
     struct fdlog *st=sst;
     if (!st->finished) {

-       *nfds_io=1;
+       BEFOREPOLL_WANT_FDS(1);

        fds[0].fd=st->fd;
        fds[0].events=POLLIN;
        fds[0].fd=st->fd;
        fds[0].events=POLLIN;

+    } else {
+       BEFOREPOLL_WANT_FDS(0);

     }
     return 0;
 }
     }
     return 0;
 }


@@ -524,6 +601,7 @@ static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds)
                    i=-1;
                }
            }
                    i=-1;
                }
            }

+       } else if (errno==EINTR || iswouldblock(errno)) {

        } else {
            Message(M_WARNING,"log_from_fd: %s\n",strerror(errno));
            st->finished=True;
        } else {
            Message(M_WARNING,"log_from_fd: %s\n",strerror(errno));
            st->finished=True;


@@ -535,7 +613,7 @@ void log_from_fd(int fd, cstring_t prefix, struct log_if *log)
 {
     struct fdlog *st;
 
 {
     struct fdlog *st;
 

-    st=safe_malloc(sizeof(*st),"log_from_fd");
+    NEW(st);

     st->log=log;
     st->fd=fd;
     st->prefix=prefix;
     st->log=log;
     st->fd=fd;
     st->prefix=prefix;


@@ -543,7 +621,9 @@ void log_from_fd(int fd, cstring_t prefix, struct log_if *log)
     st->i=0;
     st->finished=False;
 
     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);
 }
 
                      prefix);
 }