diff --git a/src/common.c b/src/common.c index 7b0baeb..dae7371 100644 --- a/src/common.c +++ b/src/common.c @@ -632,8 +632,8 @@ void logstdout(struct clientparam * param, const unsigned char *s) { FILE *log; pthread_mutex_lock(&log_mutex); - log = param->srv->stdlog?param->srv->stdlog:conf.stdlog?conf.stdlog:stdout; dobuf(param, tmpbuf, s, NULL); + log = param->srv->stdlog?param->srv->stdlog:conf.stdlog?conf.stdlog:stdout; if(!param->nolog)if(fprintf(log, "%s\n", tmpbuf) < 0) { perror("printf()"); }; diff --git a/src/conf.c b/src/conf.c index a7001cf..8468b09 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1776,10 +1776,12 @@ void freeconf(struct extparam *confp){ logname = confp->logname; confp->logname = NULL; */ + confp->logfunc = lognone; logformat = confp->logformat; confp->logformat = NULL; confp->rotate = 0; confp->logtype = NONE; + confp->logtime = confp->time = 0; archiverc = confp->archiverc; confp->archiverc = 0; @@ -1801,8 +1803,6 @@ void freeconf(struct extparam *confp){ numservers = 0; acl = confp->acl; confp->acl = NULL; - confp->logtime = confp->time = 0; - confp->logfunc = lognone; usleep(SLEEPTIME);