From: W.C.A. Wijngaards Date: Wed, 30 Sep 2020 09:38:11 +0000 (+0200) Subject: - Easier kill of unbound-dnstap-socket tool in test. X-Git-Tag: release-1.12.0rc1~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a453ab629c238edf7626124f3373cb0bf8d4062f;p=thirdparty%2Funbound.git - Easier kill of unbound-dnstap-socket tool in test. --- diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c index ca950c8bf..5a540f337 100644 --- a/dnstap/unbound-dnstap-socket.c +++ b/dnstap/unbound-dnstap-socket.c @@ -1209,9 +1209,9 @@ setup_and_run(struct config_strlist_head* local_list, if(verbosity) log_info("start of service"); ub_event_base_dispatch(base); + sig_base = NULL; if(verbosity) log_info("end of service"); - sig_base = NULL; tap_socket_list_delete(maindata->acceptlist); ub_event_base_free(base); free(maindata); diff --git a/doc/Changelog b/doc/Changelog index ff370f0b2..3dd45963a 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -3,6 +3,7 @@ - Add dohclient test executable to gitignore. - Fix stream_ssl, ssl_req_order and ssl_req_timeout tests for alloc check debug output. + - Easier kill of unbound-dnstap-socket tool in test. 29 September 2020: Ralph - DNS Flag Day 2020: change edns-buffer-size default to 1232. diff --git a/testdata/dnstap_reconnect.tdir/dnstap_reconnect.post b/testdata/dnstap_reconnect.tdir/dnstap_reconnect.post index 8474b3a02..0056a20d9 100644 --- a/testdata/dnstap_reconnect.tdir/dnstap_reconnect.post +++ b/testdata/dnstap_reconnect.tdir/dnstap_reconnect.post @@ -13,4 +13,6 @@ kill_pid $FWD_PID kill $UNBOUND_PID kill $UNBOUND_PID >/dev/null 2>&1 cat unbound.log +cat tap.log +cat tap.errlog exit 0