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, ...)
-{
- va_list ap;
-
- va_start(ap,message);
- log_vmulti(st,priority,message,ap);
- va_end(ap);
-}
-
struct log_if *init_log(list_t *ll)
{
int i=0;
}
r=safe_malloc(sizeof(*r), "init_log");
r->st=l;
- r->logfn=log_multi;
r->vlogfn=log_vmulti;
+ r->buff[0]=0;
return r;
}
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;
}
}
-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 },
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)
{
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;
}
st->i=0;
st->finished=False;
- register_for_poll(st,log_from_fd_beforepoll,log_from_fd_afterpoll,1,
+ register_for_poll(st,log_from_fd_beforepoll,log_from_fd_afterpoll,
prefix);
}