log verbosity

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

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 0d6ad4b26a77620e91aff32855e9d00c5714951b..43334d696da2a2fff3410998b919b555f780b1f7 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -281,7 +281,8 @@ static void daemon_setup_modules(struct daemon* daemon)
        daemon->env->worker = NULL;
        daemon->env->need_to_validate = 0; /* set by module init below */
        for(i=0; i<daemon->num_modules; i++) {
-               log_info("init module %d: %s", i, daemon->modfunc[i]->name);
+               verbose(VERB_OPS, "init module %d: %s", 
+                       i, daemon->modfunc[i]->name);
                log_assert(fptr_whitelist_mod_init(daemon->modfunc[i]->init));
                if(!(*daemon->modfunc[i]->init)(daemon->env, i)) {
                        fatal_exit("module init for module %s failed",
@@ -435,6 +436,7 @@ daemon_fork(struct daemon* daemon)
        /* Start resolver service on main thread. */
        log_info("start of service (%s).", PACKAGE_STRING);
        worker_work(daemon->workers[0]);
+       log_info("service stopped (%s).", PACKAGE_STRING);
 
        /* we exited! a signal happened! Stop other threads */
        daemon_stop_others(daemon);

diff --git a/daemon/unbound.c b/daemon/unbound.c
index 44791250683e00e79b811672cf6aa72c0684e3a2..9e53613e079f541631018400711df1f2641c9023 100644 (file)
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -339,8 +339,8 @@ run_daemon(char* cfgfile, int cmdline_verbose, int debug_mode)
                fatal_exit("alloc failure");
        while(!daemon->need_to_exit) {
                if(done_chroot)
-                       log_info("Restart of %s.", PACKAGE_STRING);
-               else    log_info("Start of %s.", PACKAGE_STRING);
+                       verbose(VERB_OPS, "Restart of %s.", PACKAGE_STRING);
+               else    verbose(VERB_OPS, "Start of %s.", PACKAGE_STRING);
 
                /* config stuff */
                if(!(cfg = config_create()))

diff --git a/daemon/worker.c b/daemon/worker.c
index 433e522201a1b6747cfc35c1d887d33f89b57434..977c111f031e0ff2ae3a96ef6fa5ff08ea78d742 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -993,10 +993,11 @@ worker_delete(struct worker* worker)
 {
        if(!worker) 
                return;
-       if(worker->env.mesh)
+       if(worker->env.mesh && verbosity >= VERB_OPS) {
                mesh_stats(worker->env.mesh, "mesh has");
-       server_stats_log(&worker->stats, worker->thread_num);
-       worker_mem_report(worker, NULL);
+               server_stats_log(&worker->stats, worker->thread_num);
+               worker_mem_report(worker, NULL);
+       }
        mesh_delete(worker->env.mesh);
        ldns_buffer_free(worker->env.scratch_buffer);
        listen_delete(worker->front);

diff --git a/doc/Changelog b/doc/Changelog
index b22d4d3d8331ab7c0bba0eb6f7c0563e92774e17..dd8f3d2f0e18a620438bdec07e904f479d7acd9e 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -10,6 +10,7 @@
        - iterator normalizer changes CNAME chains ending in NXDOMAIN where
          the packet got rcode NXDOMAIN into rcode NOERROR. (since the initial
          domain exists).
+       - nicer verbosity: 0 and 1 levels.
 
 27 November 2007: Wouter
        - per suggestion in rfc2308, replaced default max-ttl value with 1 day.