[svn] commit: r3394 - in /branches/vorner-recursor-dummylog/src: bin/recurse/Makefile.am bin/recurse/tests/Makefile.am lib/Makefile.am lib/asiolink/Makefile.am lib/asiolink/asiolink.cc lib/asiolink/tests/Makefile.am

[BIND 10 source code commits]

Author: vorner
Date: Thu Oct 28 19:53:05 2010
New Revision: 3394

Log:
Forgotten place to log

Modified:
    branches/vorner-recursor-dummylog/src/bin/recurse/Makefile.am
    branches/vorner-recursor-dummylog/src/bin/recurse/tests/Makefile.am
    branches/vorner-recursor-dummylog/src/lib/Makefile.am
    branches/vorner-recursor-dummylog/src/lib/asiolink/Makefile.am
    branches/vorner-recursor-dummylog/src/lib/asiolink/asiolink.cc
    branches/vorner-recursor-dummylog/src/lib/asiolink/tests/Makefile.am

Modified: branches/vorner-recursor-dummylog/src/bin/recurse/Makefile.am
==============================================================================
--- branches/vorner-recursor-dummylog/src/bin/recurse/Makefile.am (original)
+++ branches/vorner-recursor-dummylog/src/bin/recurse/Makefile.am Thu Oct 28 19:53:05 2010
@@ -46,7 +46,6 @@
 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
 

Modified: branches/vorner-recursor-dummylog/src/bin/recurse/tests/Makefile.am
==============================================================================
--- branches/vorner-recursor-dummylog/src/bin/recurse/tests/Makefile.am (original)
+++ branches/vorner-recursor-dummylog/src/bin/recurse/tests/Makefile.am Thu Oct 28 19:53:05 2010
@@ -31,7 +31,6 @@
 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)

Modified: branches/vorner-recursor-dummylog/src/lib/Makefile.am
==============================================================================
--- branches/vorner-recursor-dummylog/src/lib/Makefile.am (original)
+++ branches/vorner-recursor-dummylog/src/lib/Makefile.am Thu Oct 28 19:53:05 2010
@@ -1,1 +1,1 @@
-SUBDIRS = exceptions dns asiolink cc config datasrc python xfr bench log
+SUBDIRS = exceptions dns cc config datasrc python xfr bench log asiolink

Modified: branches/vorner-recursor-dummylog/src/lib/asiolink/Makefile.am
==============================================================================
--- branches/vorner-recursor-dummylog/src/lib/asiolink/Makefile.am (original)
+++ branches/vorner-recursor-dummylog/src/lib/asiolink/Makefile.am Thu Oct 28 19:53:05 2010
@@ -25,3 +25,4 @@
 libasiolink_la_CXXFLAGS += -Wno-unused-parameter
 endif
 libasiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
+libasiolink_la_LIBADD = $(top_builddir)/src/lib/log/liblog.la

Modified: branches/vorner-recursor-dummylog/src/lib/asiolink/asiolink.cc
==============================================================================
--- branches/vorner-recursor-dummylog/src/lib/asiolink/asiolink.cc (original)
+++ branches/vorner-recursor-dummylog/src/lib/asiolink/asiolink.cc Thu Oct 28 19:53:05 2010
@@ -33,12 +33,15 @@
 #include <asiolink/internal/tcpdns.h>
 #include <asiolink/internal/udpdns.h>
 
+#include <log/dummylog.h>
+
 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 @@
 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

Modified: branches/vorner-recursor-dummylog/src/lib/asiolink/tests/Makefile.am
==============================================================================
--- branches/vorner-recursor-dummylog/src/lib/asiolink/tests/Makefile.am (original)
+++ branches/vorner-recursor-dummylog/src/lib/asiolink/tests/Makefile.am Thu Oct 28 19:53:05 2010
@@ -25,6 +25,7 @@
 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)