From 61048bb729e653f46bce43d71ff37169817dba8b Mon Sep 17 00:00:00 2001 From: Michal Vaner Date: Thu, 28 Oct 2010 19:53:05 +0000 Subject: Forgotten place to log git-svn-id: svn://bind10.isc.org/svn/bind10/branches/vorner-recursor-dummylog@3394 e5f2f494-b856-4b98-b285-d166d9295462 --- src/bin/recurse/Makefile.am | 1 - src/bin/recurse/tests/Makefile.am | 1 - src/lib/Makefile.am | 2 +- src/lib/asiolink/Makefile.am | 1 + src/lib/asiolink/asiolink.cc | 5 ++++- src/lib/asiolink/tests/Makefile.am | 1 + 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bin/recurse/Makefile.am b/src/bin/recurse/Makefile.am index 75534937f8..e74449d185 100644 --- a/src/bin/recurse/Makefile.am +++ b/src/bin/recurse/Makefile.am @@ -46,7 +46,6 @@ b10_recurse_LDADD += $(top_builddir)/src/lib/cc/libcc.la b10_recurse_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la b10_recurse_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la b10_recurse_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la -b10_recurse_LDADD += $(top_builddir)/src/lib/log/liblog.la b10_recurse_LDADD += $(top_builddir)/src/bin/auth/change_user.o b10_recurse_LDFLAGS = -pthread diff --git a/src/bin/recurse/tests/Makefile.am b/src/bin/recurse/tests/Makefile.am index c70535a512..bc193e0bcb 100644 --- a/src/bin/recurse/tests/Makefile.am +++ b/src/bin/recurse/tests/Makefile.am @@ -31,7 +31,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la -run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la endif noinst_PROGRAMS = $(TESTS) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index cbfb81421a..a22897db56 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1 +1 @@ -SUBDIRS = exceptions dns asiolink cc config datasrc python xfr bench log +SUBDIRS = exceptions dns cc config datasrc python xfr bench log asiolink diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am index cc7e717567..10331cecb4 100644 --- a/src/lib/asiolink/Makefile.am +++ b/src/lib/asiolink/Makefile.am @@ -25,3 +25,4 @@ if USE_GXX libasiolink_la_CXXFLAGS += -Wno-unused-parameter endif libasiolink_la_CPPFLAGS = $(AM_CPPFLAGS) +libasiolink_la_LIBADD = $(top_builddir)/src/lib/log/liblog.la diff --git a/src/lib/asiolink/asiolink.cc b/src/lib/asiolink/asiolink.cc index e8ca5e3861..d5dca8a38b 100644 --- a/src/lib/asiolink/asiolink.cc +++ b/src/lib/asiolink/asiolink.cc @@ -33,12 +33,15 @@ #include #include +#include + using namespace asio; using asio::ip::udp; using asio::ip::tcp; using namespace std; using namespace isc::dns; +using isc::log::dlog; namespace asiolink { @@ -231,7 +234,7 @@ void RecursiveQuery::sendQuery(const Question& question, OutputBufferPtr buffer, DNSServer* server) { - + dlog("Sending upstream query to " + ns_addr_.toText()); // XXX: eventually we will need to be able to determine whether // the message should be sent via TCP or UDP, or sent initially via // UDP and then fall back to TCP on failure, but for the moment diff --git a/src/lib/asiolink/tests/Makefile.am b/src/lib/asiolink/tests/Makefile.am index 42e3df7415..f50dfb9df3 100644 --- a/src/lib/asiolink/tests/Makefile.am +++ b/src/lib/asiolink/tests/Makefile.am @@ -25,6 +25,7 @@ run_unittests_LDADD += $(SQLITE_LIBS) run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la +run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la # Note: the ordering matters: -Wno-... must follow -Wextra (defined in # B10_CXXFLAGS) run_unittests_CXXFLAGS = $(AM_CXXFLAGS) -- cgit v1.2.3