no debug on low verbosity.

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

diff --git a/iterator/iter_delegpt.c b/iterator/iter_delegpt.c
index ecb3c64e50d650031c367c4941c16fd3dfb021b7..d63eca301c1a3ed902fa609fb1204d068639abe0 100644 (file)
--- a/iterator/iter_delegpt.c
+++ b/iterator/iter_delegpt.c
@@ -189,12 +189,14 @@ delegpt_count_addr(struct delegpt* dp, size_t* numaddr, size_t* numres,
        }
 }
 
-void delegpt_log(struct delegpt* dp)
+void delegpt_log(enum verbosity_value v, struct delegpt* dp)
 {
        char buf[LDNS_MAX_DOMAINLEN+1];
        struct delegpt_ns* ns;
        struct delegpt_addr* a;
        size_t missing=0, numns=0, numaddr=0, numres=0, numavail=0;
+       if(verbosity < v)
+               return;
        dname_str(dp->name, buf);
        if(dp->nslist == NULL && dp->target_list == NULL) {
                log_info("DelegationPoint<%s>: empty", buf);

diff --git a/iterator/iter_delegpt.h b/iterator/iter_delegpt.h
index 174ccc2ebe8e8bdcd7b2e113ca597c5e76c58ad1..0a309e25be94e5c3072c711e12c18501ae0c4add 100644 (file)
--- a/iterator/iter_delegpt.h
+++ b/iterator/iter_delegpt.h
@@ -47,6 +47,7 @@ struct delegpt_ns;
 struct delegpt_addr;
 struct dns_msg;
 struct ub_packed_rrset_key;
+enum verbosity_value;
 
 /**
  * Delegation Point.
@@ -216,9 +217,10 @@ struct delegpt_ns* delegpt_find_ns(struct delegpt* dp, uint8_t* name,
 
 /**
  * Print the delegation point to the log. For debugging.
+ * @param v: verbosity value that is needed to emit to log.
  * @param dp: delegation point.
  */
-void delegpt_log(struct delegpt* dp);
+void delegpt_log(enum verbosity_value v, struct delegpt* dp);
 
 /**
  * Add all usable targets to the result list.

diff --git a/iterator/iter_fwd.c b/iterator/iter_fwd.c
index eca2671fa27f3043d3fa8e5b8a5333484d187015..c3da7787210d4e74a1bbe6e0d54bfb0b78ecd407 100644 (file)
--- a/iterator/iter_fwd.c
+++ b/iterator/iter_fwd.c
@@ -228,8 +228,8 @@ read_forwards(struct iter_forwards* fwd, struct config_file* cfg)
                        return 0;
                if(!forwards_insert(fwd, LDNS_RR_CLASS_IN, dp))
                        return 0;
-               log_info("Forward zone server list:");
-               delegpt_log(dp);
+               verbose(VERB_DETAIL, "Forward zone server list:");
+               delegpt_log(VERB_DETAIL, dp);
        }
        return 1;
 }

diff --git a/iterator/iter_hints.c b/iterator/iter_hints.c
index 108c93f704551e598413b1cfdd49ae2c497feaee..6866f28936c154a9a935fce1273ee3d2523e1445 100644 (file)
--- a/iterator/iter_hints.c
+++ b/iterator/iter_hints.c
@@ -285,8 +285,7 @@ read_stubs(struct iter_hints* hints, struct config_file* cfg)
                        return 0;
                if(!hints_insert(hints, LDNS_RR_CLASS_IN, dp))
                        return 0;
-               if(verbosity >= VERB_DETAIL)
-                       delegpt_log(dp);
+               delegpt_log(VERB_DETAIL, dp);
        }
        return 1;
 }
@@ -312,8 +311,7 @@ hints_apply_cfg(struct iter_hints* hints, struct config_file* cfg)
                        return 0;
                if(!hints_insert(hints, LDNS_RR_CLASS_IN, dp))
                        return 0;
-               if(verbosity >= VERB_DETAIL)
-                       delegpt_log(dp);
+               delegpt_log(VERB_DETAIL, dp);
        }
 
        init_parents(hints);

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 805ca5ef35dc46cddfb432ee10a06995a0d7c0f5..d5feee1ccc90f0703f4e5ebfa231189650e8e884 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -186,7 +186,7 @@ error_supers(struct module_qstate* qstate, int id, struct module_qstate* super)
                        /* not interested */
                        verbose(VERB_ALGO, "subq error, but not interested");
                        log_query_info(VERB_ALGO, "superq", &super->qinfo);
-                       delegpt_log(super_iq->dp);
+                       delegpt_log(VERB_ALGO, super_iq->dp);
                        log_assert(0);
                        return;
                }
@@ -784,8 +784,9 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
                                }
                                break;
                        } else {
-                               log_info("cache delegation was useless:");
-                               delegpt_log(iq->dp);
+                               verbose(VERB_ALGO, 
+                                       "cache delegation was useless:");
+                               delegpt_log(VERB_ALGO, iq->dp);
                                /* go up */
                                delname = iq->dp->name;
                                delnamelen = iq->dp->namelen;
@@ -794,10 +795,8 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
                } else break;
        }
 
-       if(verbosity >= VERB_ALGO) {
-               log_info("cache delegation returns delegpt");
-               delegpt_log(iq->dp);
-       }
+       verbose(VERB_ALGO, "cache delegation returns delegpt");
+       delegpt_log(VERB_ALGO, iq->dp);
 
        /* Reset the RD flag. If this is a query restart, then the RD 
         * will have been turned off. */
@@ -1041,7 +1040,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
                verbose(VERB_DETAIL, "Failed to get a delegation, giving up");
                return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
        }
-       delegpt_log(iq->dp);
+       delegpt_log(VERB_ALGO, iq->dp);
 
        if(iq->num_current_queries>0) {
                /* already busy answering a query, this restart is because
@@ -1219,7 +1218,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
                if(!cache_fill_missing(qstate->env, iq->qchase.qclass, 
                        qstate->region, iq->dp))
                        return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
-               delegpt_log(iq->dp);
+               delegpt_log(VERB_ALGO, iq->dp);
                /* Count this as a referral. */
                iq->referral_count++;
 
@@ -1334,7 +1333,7 @@ prime_supers(struct module_qstate* qstate, int id, struct module_qstate* forq)
        }
 
        log_query_info(VERB_DETAIL, "priming successful for", &qstate->qinfo);
-       delegpt_log(dp);
+       delegpt_log(VERB_ALGO, dp);
        foriq->dp = dp;
        foriq->deleg_msg = dns_copy_msg(qstate->return_msg, forq->region);
        if(!foriq->deleg_msg) {
@@ -1447,7 +1446,7 @@ processTargetResponse(struct module_qstate* qstate, int id,
                if(!delegpt_add_rrset(foriq->dp, forq->region, rrset))
                        log_err("out of memory adding targets");
                verbose(VERB_ALGO, "added target response");
-               delegpt_log(foriq->dp);
+               delegpt_log(VERB_ALGO, foriq->dp);
        } else {
                verbose(VERB_ALGO, "iterator TargetResponse failed");
                dpns->resolved = 1; /* fail the target */

diff --git a/validator/val_kentry.c b/validator/val_kentry.c
index d8fd2757ec1b44cc04d37916673ad10cecd6a280..8905b1640031902f19abf43161fa82b4ab7dbef9 100644 (file)
--- a/validator/val_kentry.c
+++ b/validator/val_kentry.c
@@ -248,7 +248,6 @@ key_entry_create_rrset(struct region* region,
                rrset->entry.data;
        if(!key_entry_setup(region, name, namelen, dclass, &k, &d))
                return NULL;
-       log_info("New key entry TTL is now+%d", (int)rd->ttl);
        d->ttl = rd->ttl + time(NULL);
        d->isbad = 0;
        d->rrset_type = ntohs(rrset->rk.type);

diff --git a/validator/validator.c b/validator/validator.c
index 57c7e9301f954896e6c5d357a09bf036b6199a0f..2246afcc1e502f26e7550e47af4992583611c53c 100644 (file)
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -1281,7 +1281,7 @@ processFindKey(struct module_qstate* qstate, struct val_qstate* vq, int id)
         * for the next DNSKEY. */
        if(vq->ds_rrset)
                log_nametypeclass(VERB_ALGO, "DS RRset", vq->ds_rrset->rk.dname, LDNS_RR_TYPE_DS, LDNS_RR_CLASS_IN);
-       else log_info("No DS RRset");
+       else verbose(VERB_ALGO, "No DS RRset");
 
        if(vq->ds_rrset && query_dname_compare(vq->ds_rrset->rk.dname,
                vq->key_entry->name) != 0) {
@@ -1685,7 +1685,8 @@ primeResponseToKE(int rcode, struct dns_msg* msg, struct trust_anchor* ta,
                        sec = sec_status_secure;
                else
                        sec = sec_status_bogus;
-               log_info("priming DS result %s", sec_status_to_string(sec));
+               verbose(VERB_ALGO, "priming DS result %s", 
+                       sec_status_to_string(sec));
        }
        if(sec != sec_status_secure && ta->dnskey_rrset) {
                sec = val_verify_rrset(qstate->env, ve, dnskey_rrset,