- Easier kill of unbound-dnstap-socket tool in test.

diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c
index ca950c8bfeb29e2f13873d94139f359890b1f019..5a540f33703daa3168cbf08e662cebf397da51d8 100644 (file)
--- 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 ff370f0b262a0256a48fe50987ecdbcbb4cd2393..3dd45963a465fe6c7f80c4bc1d1fb95bba0a3ab2 100644 (file)
--- 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 8474b3a02cfca3aa0dcc550d8d60f79c5a51e115..0056a20d9506581f42d36144b2805e42c6da72ca 100644 (file)
--- 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