From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 5 Feb 2018 15:09:03 +0000 (+0100)
Subject: Merge pull request #6170 from zeha/dnstap
X-Git-Tag: dnsdist-1.3.0~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad3e18738ccdc5d984dd3fc290a95c9fe3542fb2;p=pdns

Merge pull request #6170 from zeha/dnstap

dnsdist: Add simple dnstap logging
---

ad3e18738ccdc5d984dd3fc290a95c9fe3542fb2
diff --cc pdns/dnsdistdist/Makefile.am
index 11cd271b2,c884135f0..1bcab9a84
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@@ -117,9 -119,10 +119,10 @@@ dnsdist_SOURCES = 
  	namespaces.hh \
  	pdnsexception.hh \
  	protobuf.cc protobuf.hh \
+ 	dnstap.cc dnstap.hh \
  	qtype.cc qtype.hh \
  	remote_logger.cc remote_logger.hh \
 -	selectmplexer.cc \
 +	pollmplexer.cc \
  	sholder.hh \
  	snmp-agent.cc snmp-agent.hh \
  	sodcrypto.cc sodcrypto.hh \