From c9955f9fdf6b6df8fdde52f3cf961e7d33b3603d Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Thu, 25 Oct 2018 13:52:13 +0000 Subject: [PATCH] - Fix #4152: Logs shows wrong time when using log-time-ascii: yes. git-svn-id: file:///svn/unbound/trunk@4957 be551aaa-1e26-0410-a405-d3ace91eadb9 --- daemon/worker.c | 3 --- doc/Changelog | 1 + util/log.c | 11 +---------- util/log.h | 7 ------- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/daemon/worker.c b/daemon/worker.c index 2697ea653..d1241e4b9 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -1802,8 +1802,6 @@ worker_init(struct worker* worker, struct config_file *cfg, alloc_set_id_cleanup(&worker->alloc, &worker_alloc_cleanup, worker); worker->env = *worker->daemon->env; comm_base_timept(worker->base, &worker->env.now, &worker->env.now_tv); - if(worker->thread_num == 0) - log_set_time(worker->env.now); worker->env.worker = worker; worker->env.worker_base = worker->base; worker->env.send_query = &worker_send_query; @@ -1909,7 +1907,6 @@ worker_delete(struct worker* worker) comm_timer_delete(worker->env.probe_timer); free(worker->ports); if(worker->thread_num == 0) { - log_set_time(NULL); #ifdef UB_ON_WINDOWS wsvc_desetup_worker(worker); #endif /* UB_ON_WINDOWS */ diff --git a/doc/Changelog b/doc/Changelog index b85836bff..b1135d98d 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -12,6 +12,7 @@ adds the option unknown-server-time-limit to unbound.conf that can be increased to avoid the problem. - remade makefile dependencies. + - Fix #4152: Logs shows wrong time when using log-time-ascii: yes. 24 October 2018: Ralph - Add markdel function to ECS slabhash. diff --git a/util/log.c b/util/log.c index 75a58f9de..82e63a92c 100644 --- a/util/log.c +++ b/util/log.c @@ -78,8 +78,6 @@ static const char* ident="unbound"; /** are we using syslog(3) to log to */ static int logging_to_syslog = 0; #endif /* HAVE_SYSLOG_H */ -/** time to print in log, if NULL, use time(2) */ -static time_t* log_now = NULL; /** print time in UTC or in secondsfrom1970 */ static int log_time_asc = 0; @@ -181,11 +179,6 @@ void log_ident_set(const char* id) ident = id; } -void log_set_time(time_t* t) -{ - log_now = t; -} - void log_set_time_asc(int use_asc) { log_time_asc = use_asc; @@ -255,9 +248,7 @@ log_vmsg(int pri, const char* type, lock_quick_unlock(&log_lock); return; } - if(log_now) - now = (time_t)*log_now; - else now = (time_t)time(NULL); + now = (time_t)time(NULL); #if defined(HAVE_STRFTIME) && defined(HAVE_LOCALTIME_R) if(log_time_asc && strftime(tmbuf, sizeof(tmbuf), "%b %d %H:%M:%S", localtime_r(&now, &tm))%(sizeof(tmbuf)) != 0) { diff --git a/util/log.h b/util/log.h index f73c0754d..a9b90de1e 100644 --- a/util/log.h +++ b/util/log.h @@ -112,13 +112,6 @@ int log_thread_get(void); */ void log_ident_set(const char* id); -/** - * Set the time value to print in log entries. - * @param t: the point is copied and used to find the time. - * if NULL, time(2) is used. - */ -void log_set_time(time_t* t); - /** * Set if the time value is printed ascii or decimal in log entries. * @param use_asc: if true, ascii is printed, otherwise decimal. -- 2.47.3