From 34c67e452df5866ead66bdd14efa34752b94201b Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Thu, 15 Feb 2007 15:50:22 +0000 Subject: [PATCH] verbosity works. git-svn-id: file:///svn/unbound/trunk@109 be551aaa-1e26-0410-a405-d3ace91eadb9 --- daemon/unbound.c | 2 +- daemon/worker.c | 2 +- doc/Changelog | 2 ++ services/outside_network.c | 14 +++++++------- testdata/fwd_tcp.tpkg | Bin 1448 -> 1468 bytes testdata/fwd_udp.tpkg | Bin 1460 -> 1461 bytes util/log.c | 3 ++- util/netevent.c | 8 ++++---- 8 files changed, 17 insertions(+), 14 deletions(-) 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 4da22e7a9b2a367d525ebac414d066a51aec1b9a..6b8cda115c1a7c2101a8b248d8014972eb49c9b0 100644 GIT binary patch literal 1468 zc-jHH1w;BDiwFQNfYe0*1ML`VbJ|AGU%6kgku^>-EV7&h>+`MIvpZQ z2dD^1xsy!X$A9mhgg`hr?qnQy(r7(Kr`y}d?c;7&lchZltw6CIR@(bQpd!@k)#O<_ z+Ip^FPgAS4s)nO-Wlz=0b*;V!)i0$`79t*+3}A2RM=%oW@qDqkPxgWP5wj?SGYSinEMpJ(F3}n6C?+(u45UQ2x5j=lRF8U{f zi}jLpF*&{5P_1W?OhXcC&3ury3A1k!v|6{-NN6@()6uTA!t@xAu^pBsv(Zeryr(x^ z+v7#C#N))7B=&hC%ptv7&Kzq7a=h-HbS&KBkwQXNn)wS_N@BNk<#?qmpNT^fDkui9 zR%;y$$tq~!yW;v&D7OwYI7rNM)@{m9vO5zKtHCGt6?s>FY-kQw3?9|;d!yWrsnobg~ zoU&^S_t1x_4^i-49Io&ZRS@~&nG4#2mpo(`!D7+U46RvjMHnp-!3YYCOV{E+Ad!uFrUxieR=#bqsRX7$;c-aJbLzPS(9%7W^ z(Dq58kOmDJPu4`vOs0$mAjxG(OteZiy)Jo?>!txzC?uw`eUAd_DWu5wBMHf{rnvGmSJc8@AL2> zW!#tlHLbeNf3;Q?`CmqKp8t;kx9WdiR0xmQ0c514CI6>n{Oi(R?7;Tn29d}Z?|Xmg zLCgpdbH{bXmQjOvSkxe`T@kx5=M;E^OJih;$y7*jWw~awx|uhuGUenBb{XtPEdK-l z-*x{#q>TIWzh2kY`LBuZL?ZuddHz2JZ0CQ{A^eZN0A!oW_(VugnpGdz!WLu-SXe08 zN=G7M_Iua2Om`-Z#KUXr<2Lj*75s&qu~mw~xP(dth=yj>3vwy$CDYC!e#sQ}8p)RNCdmno%F}LcaM8{9!p_-mGyYk=W)`P~_ zeffWMRNLggT1~$Hsd@fC2Ar6j_OV!Rq-Oy6nKJJ9UIR2mC0)ub<^*9pahkNwV1m&Z zVoF+b8e){%z-SmT4Z8`XNF@&Y(H;hkpQXNogqnC;$Nb)7u;X literal 1448 zc-jG|1y}kXiwFSF5X(gX1ML`VbJ|AGU%6kgku{DzE2!!J z9iSp4MGq7A@!z|5LLdl^`+>NVM(eS4w|l#Lx3AmtXl@N7)0ZqeDD8bAkP%K#E6KNd zvi4oTo+4MOYE_ZT3gQ*@RIThm!41da5k_FIQFce?>+V$UEJ|Bk+y;e;@XXMaX!*SllQ35PET7QivuLW=4ny zhkLZr$aW~qC)5QydKofmK*_IA9DyX2q{yF+C0r&gIDUhJgH+HKI%zN z0oX3^F(Pf_4psU_7~1Z5p=zCBP0JdI5UtxD_IsLM7Y`3X)SBIP?;4JwQm&l9(Gj`n zp7(B+OVY*U;&#Qg#3Gx5EYzHMAgnWHX96@Do7+fuR#MZ^wzbUk7?0czb0e_OOt`$G z)g8+Xi)@J-5_^=`=LIu|@P0nA%?XHn-FxATxy2=ggsn93X0(*VZt2c;OIbN1n@%yZSQi!ZV#V~EAzv*(K4J1=%E?qdwDJHwog1BM}e zty33RoJax@aZ*Z`vdv{}%ubCrge2pS0>wWvTW>6Qvin`KX7{{?%uKfK-87;t=b0OJ z60RW)?lIgW55^wE{&zfF;Wci7<%?^~Xain{QGgN57R`;woHWQNcFoB4TrOvr$QZ`{ z;Su~v3fIkFhBy78uDz?D$fR)FywZpIrPdkL%Q$69F`%R1p)SK2`@-uwh%2T9d3=mP zjzh~Mg#yORXdF-<1W^@0RG?9^=zYnJ9Vd;LLLsq@<+&7aV@$4ye*{Ll3#c(Y!x07z zm&PNIk)cRGWR-7<8zkmIhoe@@w!rnG#8NM~WM*Aa;p;!5MU_XCj46mKJFJw14#iU` z3nsRA^7op1mYKwiZ(=&2W*&~*Aur$9Sd3gY#3TD&5WQquMdwLm-7}Epf$#~7u%iQcfS7n)yP8TzMc;3M^<(@_+7e$-WJ#5!vMgb7Om@=gws)2i-xNHS|GU)jRQ{i4`hSJJ z6P1cut>*dv9I)R1^8)aHdI4mc%6;sF_<1s2c>_C=F<@blvXxFC4Ew#~nT9j*P{r}R z`Dq)v$pwF*WbB;ch?me*0qbuTyLpd#$Ti^fQ^X7k5scgRgRV3&6{|vD4{`a0a z|1(pc1N2rOuViydBfO<72xt@sE`EIHK_aby z8jPWBL?~9D#Bf3H0A7Kj)+(p9@+)X{bWkw{$hBd+5&qJk238=!t<;j5__2R?#|Ekj zNehLHz2Kn+q~*hUT zqZxm^V0Sdi>0`G+ts1#7YzH&9mcJ}=$RURua>yZv9CFAZha7VF%Hbb!LxHLQC;$Mh CC(l#> diff --git a/testdata/fwd_udp.tpkg b/testdata/fwd_udp.tpkg index 4f1590a8ceb973a67b15d9cee73187fa1ae2862a..57229abd86faed71461b683cbaa7b81e05371d78 100644 GIT binary patch literal 1461 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 OJ@^+Q4ptZdC;$LpKG{$J 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); } -- 2.47.2