modules/dnstap: Change option names to socket_path and log_responses, we don't use...

diff --git a/modules/dnstap/README.rst b/modules/dnstap/README.rst
index e33b5a91ca21a024c2b9f749a821cf610d0e39c4..442b4cfcd2bc204aae4e2d7faf8d9338737b1bad 100644 (file)
--- a/modules/dnstap/README.rst
+++ b/modules/dnstap/README.rst
@@ -11,14 +11,14 @@ Configuration
 ^^^^^^^^^^^^^
 Tunables:
 
-* ``sockpath``: the the unix socket file where dnstap messages will be sent
-* ``logRespPkt``: if true responses in wire format will be logged
+* ``socket_path``: the the unix socket file where dnstap messages will be sent
+* ``log_responses``: if true responses in wire format will be logged
 
 .. code-block:: lua
 
     modules = {
         dnstap = {
-            sockPath = "/tmp/dnstap.sock",
-            logRespPkt = true
+            socket_path = "/tmp/dnstap.sock",
+            log_responses = true
         }
     }

diff --git a/modules/dnstap/dnstap.c b/modules/dnstap/dnstap.c
index 9417b08aa8c16baf8bb24a0de62b4d27bd242f9c..4f6e2f7d2490f4729da2cc8c40d74c4a83067767 100644 (file)
--- a/modules/dnstap/dnstap.c
+++ b/modules/dnstap/dnstap.c
@@ -26,8 +26,8 @@
 #include "contrib/cleanup.h"
 
 #define DEBUG_MSG(fmt, ...) kr_log_verbose("[dnstap] " fmt, ##__VA_ARGS__);
-#define CFG_SOCK_PATH "sockPath"
-#define CFG_LOG_RESP_PKT "logRespPkt"
+#define CFG_SOCK_PATH "socket_path"
+#define CFG_LOG_RESP_PKT "log_responses"
 #define DEFAULT_SOCK_PATH "/tmp/dnstap.sock"
 #define DNSTAP_CONTENT_TYPE "protobuf:dnstap.Dnstap"
 #define DNSTAP_INITIAL_BUF_SIZE         256
@@ -211,7 +211,6 @@ static int dnstap_log(kr_layer_t *ctx) {
 
 KR_EXPORT
 int dnstap_init(struct kr_module *module) {
-       DEBUG_MSG("loading\n");
        /* allocated memory for internal data */
        struct dnstap_data *data = malloc(sizeof(*data));
        if (!data) {
@@ -226,7 +225,6 @@ int dnstap_init(struct kr_module *module) {
 
 KR_EXPORT
 int dnstap_deinit(struct kr_module *module) {
-       DEBUG_MSG("unloading\n");
        struct dnstap_data *data = module->data;
        /* Free allocated memory */
        if (data) {

diff --git a/tests/dnstap/src/dnstap-test/config b/tests/dnstap/src/dnstap-test/config
index 0923ebb52fc1c8219fefcd502beb1fbc18858ac9..50fca5899ba61a562ca4ed189eb703feedfd16ae 100644 (file)
--- a/tests/dnstap/src/dnstap-test/config
+++ b/tests/dnstap/src/dnstap-test/config
@@ -2,8 +2,8 @@ verbose(true)
 modules = {
        'hints',
        dnstap = {
-               sockPath = "/tmp/dnstap.sock",
-               logRespPkt = true,
+               socket_path = "/tmp/dnstap.sock",
+               log_responses = true,
        }
 }
 hints['fake1.localdomain'] = '1.2.3.4'