- bug #361: Fix, time.elapsed variable not reset with stats_noreset.

git-svn-id: file:///svn/unbound/trunk@2396 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/remote.c b/daemon/remote.c
index 4b10735fd151f531013d13b5ca64f5f32d4c7c94..a5e10b4ff6e3a543593f0d84fd80ea744fe5feff 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -702,13 +702,14 @@ print_mem(SSL* ssl, struct worker* worker, struct daemon* daemon)
 
 /** print uptime stats */
 static int
-print_uptime(SSL* ssl, struct worker* worker)
+print_uptime(SSL* ssl, struct worker* worker, int reset)
 {
        struct timeval now = *worker->env.now_tv;
        struct timeval up, dt;
        timeval_subtract(&up, &now, &worker->daemon->time_boot);
        timeval_subtract(&dt, &now, &worker->daemon->time_last_stat);
-       worker->daemon->time_last_stat = now;
+       if(reset)
+               worker->daemon->time_last_stat = now;
        if(!ssl_printf(ssl, "time.now"SQ"%d.%6.6d\n", 
                (unsigned)now.tv_sec, (unsigned)now.tv_usec)) return 0;
        if(!ssl_printf(ssl, "time.up"SQ"%d.%6.6d\n", 
@@ -892,7 +893,7 @@ do_stats(SSL* ssl, struct daemon_remote* rc, int reset)
        total.mesh_time_median /= (double)daemon->num;
        if(!print_stats(ssl, "total", &total)) 
                return;
-       if(!print_uptime(ssl, rc->worker))
+       if(!print_uptime(ssl, rc->worker, reset))
                return;
        if(daemon->cfg->stat_extended) {
                if(!print_mem(ssl, rc->worker, daemon)) 

diff --git a/doc/Changelog b/doc/Changelog
index 1930e578a157d0505b84c3a2b9a3e3bf44a7581d..344e804a15132a5cc2b05d7a24ba8b5aa955b093 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+24 February 2011: Wouter
+       - bug #361: Fix, time.elapsed variable not reset with stats_noreset.
+
 23 February 2011: Wouter
        - iana portlist updated.
        - common.sh to version 3.