From: Wouter Wijngaards Date: Thu, 15 Feb 2007 15:50:22 +0000 (+0000) Subject: verbosity works. X-Git-Tag: release-0.0~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34c67e452df5866ead66bdd14efa34752b94201b;p=thirdparty%2Funbound.git verbosity works. git-svn-id: file:///svn/unbound/trunk@109 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/daemon/unbound.c b/daemon/unbound.c index e9dbd2e2b..cece1953e 100644 --- a/daemon/unbound.c +++ b/daemon/unbound.c @@ -133,7 +133,7 @@ main(int argc, char* argv[]) } /* drop user priviliges and chroot if needed */ - verbose(VERB_OPS, "start of service (%s).", PACKAGE_STRING); + log_info("start of service (%s).", PACKAGE_STRING); worker_work(worker); /* cleanup */ diff --git a/daemon/worker.c b/daemon/worker.c index c567496b5..995bc9284 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -155,7 +155,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error, { struct worker* worker = (struct worker*)arg; int ret; - log_info("worker handle request"); + verbose(VERB_DETAIL, "worker handle request"); if(error != NETEVENT_NOERROR) { log_err("called with err=%d", error); return 0; diff --git a/doc/Changelog b/doc/Changelog index 91c86c91e..19591a57e 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -4,6 +4,8 @@ - malloc rndstate, so that it is aligned for access. - fixed rbtree cleanup with postorder traverse. - fixed pending messages are deleted when handled. + - You can control verbosity; default is not verbose, every -v + adds more verbosity. 14 February 2007: Wouter - Included configure.ac changes from ldns. diff --git a/services/outside_network.c b/services/outside_network.c index f6755c044..482a7bcd7 100644 --- a/services/outside_network.c +++ b/services/outside_network.c @@ -117,7 +117,7 @@ outnet_udp_cb(struct comm_point* c, void* arg, int error, struct outside_network* outnet = (struct outside_network*)arg; struct pending key; struct pending* p; - log_info("answer cb"); + verbose(VERB_ALGO, "answer cb"); if(error != NETEVENT_NOERROR) { log_info("outnetudp got udp error %d", error); @@ -129,11 +129,11 @@ outnet_udp_cb(struct comm_point* c, void* arg, int error, key.id = LDNS_ID_WIRE(ldns_buffer_begin(c->buffer)); memcpy(&key.addr, &reply_info->addr, reply_info->addrlen); key.addrlen = reply_info->addrlen; - log_info("Incoming reply id=%4.4x addr=", key.id); + verbose(VERB_ALGO, "Incoming reply id=%4.4x addr=", key.id); log_addr(&key.addr, key.addrlen); /* find it, see if this thing is a valid query response */ - log_info("lookup size is %d entries", (int)outnet->pending->count); + verbose(VERB_ALGO, "lookup size is %d entries", (int)outnet->pending->count); p = (struct pending*)rbtree_search(outnet->pending, &key); if(!p) { verbose(VERB_DETAIL, "received unsolicited udp reply. dropped."); @@ -147,7 +147,7 @@ outnet_udp_cb(struct comm_point* c, void* arg, int error, return 0; } comm_timer_disable(p->timer); - log_info("outnet handle udp reply"); + verbose(VERB_ALGO, "outnet handle udp reply"); (void)(*p->cb)(p->c, p->cb_arg, NETEVENT_NOERROR, NULL); pending_delete(outnet, p); return 0; @@ -261,7 +261,7 @@ pending_udp_timer_cb(void *arg) { struct pending* p = (struct pending*)arg; /* it timed out */ - log_info("timeout udp"); + verbose(VERB_ALGO, "timeout udp"); (void)(*p->cb)(p->c, p->cb_arg, NETEVENT_TIMEOUT, NULL); pending_delete(p->outnet, p); } @@ -427,7 +427,7 @@ new_pending(struct outside_network* outnet, ldns_buffer* packet, return NULL; } } - log_info("inserted new pending reply id=%4.4x addr=", pend->id); + verbose(VERB_ALGO, "inserted new pending reply id=%4.4x addr=", pend->id); log_addr(&pend->addr, pend->addrlen); return pend; } @@ -484,7 +484,7 @@ select_port(struct outside_network* outnet, struct pending* pend) else pend->c = outnet->udp4_ports[chosen]; log_assert(pend->c); - log_info("query %x outbound %d of %d", pend->id, chosen, nummax); + verbose(VERB_ALGO, "query %x outbound %d of %d", pend->id, chosen, nummax); } diff --git a/testdata/fwd_tcp.tpkg b/testdata/fwd_tcp.tpkg index 4da22e7a9..6b8cda115 100644 Binary files a/testdata/fwd_tcp.tpkg and b/testdata/fwd_tcp.tpkg differ diff --git a/testdata/fwd_udp.tpkg b/testdata/fwd_udp.tpkg index 4f1590a8c..57229abd8 100644 Binary files a/testdata/fwd_udp.tpkg and b/testdata/fwd_udp.tpkg differ diff --git a/util/log.c b/util/log.c index f0fabb691..f91f9a1ce 100644 --- a/util/log.c +++ b/util/log.c @@ -43,7 +43,7 @@ #include #endif -enum verbosity_value verbosity = 3; +enum verbosity_value verbosity = 0; void log_init() @@ -58,6 +58,7 @@ log_vmsg(const char* type, const char *format, va_list args) vsnprintf(message, sizeof(message), format, args); fprintf(stderr, "[%d] %s[%d] %s: %s\n", (int)time(NULL), ident, (int)getpid(), type, message); + fflush(stderr); } /** diff --git a/util/netevent.c b/util/netevent.c index 39d702f42..1d99cb683 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -386,7 +386,7 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c) verbose(VERB_DETAIL, "tcp: dropped bogus too short."); return 0; } - log_info("Reading tcp query of length %d", + verbose(VERB_ALGO, "Reading tcp query of length %d", (int)ldns_buffer_limit(c->buffer)); } @@ -712,7 +712,7 @@ comm_point_drop_reply(struct comm_reply* repinfo) void comm_point_stop_listening(struct comm_point* c) { - log_info("comm point stop listening %d", c->fd); + verbose(VERB_ALGO, "comm point stop listening %d", c->fd); if(event_del(&c->ev->ev) != 0) { log_err("event_del error to stoplisten"); } @@ -721,7 +721,7 @@ comm_point_stop_listening(struct comm_point* c) void comm_point_start_listening(struct comm_point* c, int newfd, int sec) { - log_info("comm point start listening %d", c->fd); + verbose(VERB_ALGO, "comm point start listening %d", c->fd); if(c->type == comm_tcp_accept && !c->tcp_free) { /* no use to start listening no free slots. */ return; @@ -918,6 +918,6 @@ log_addr(struct sockaddr_storage* addr, socklen_t addrlen) strncpy(dest, "(inet_ntop error)", sizeof(dest)); } port = ntohs(((struct sockaddr_in*)addr)->sin_port); - log_info("addr fam=%s port=%d dest=%s len=%d", + verbose(VERB_DETAIL, "addr fam=%s port=%d dest=%s len=%d", family, (int)port, dest, (int)addrlen); }