[svn] commit: r3786 - in /branches/trac327/src: bin/recurse/main.cc bin/recurse/recursor.cc lib/asiolink/asiolink.cc

[BIND 10 source code commits]

Author: jelte
Date: Thu Dec  9 16:56:59 2010
New Revision: 3786

Log:
removed extraneous updateConfig call in recursor's main.cc (made it try to bind twice)
also added a few more dlog() calls

Modified:
    branches/trac327/src/bin/recurse/main.cc
    branches/trac327/src/bin/recurse/recursor.cc
    branches/trac327/src/lib/asiolink/asiolink.cc

Modified: branches/trac327/src/bin/recurse/main.cc
==============================================================================
--- branches/trac327/src/bin/recurse/main.cc (original)
+++ branches/trac327/src/bin/recurse/main.cc Thu Dec  9 16:56:59 2010
@@ -164,7 +164,6 @@
         }
 
         recursor->setConfigSession(config_session);
-        recursor->updateConfig(config_session->getFullConfig());
         dlog("Config loaded");
 
         dlog("Server started.");

Modified: branches/trac327/src/bin/recurse/recursor.cc
==============================================================================
--- branches/trac327/src/bin/recurse/recursor.cc (original)
+++ branches/trac327/src/bin/recurse/recursor.cc Thu Dec  9 16:56:59 2010
@@ -577,12 +577,13 @@
          * If that fails, bad luck, but we are useless anyway, so just die
          * and let boss start us again.
          */
+        dlog(string("Unable to set new address: ") + e.what());
         try {
             setAddresses(dnss_, impl_->listen_);
         }
         catch (const exception& e2) {
-            dlog(string("Unable to recover from error: ") + e.what() +
-                " Rollback failed with: " + e2.what());
+            dlog(string("Unable to recover from error;"));
+            dlog(string("Rollback failed with: ") + e2.what());
             abort();
         }
         throw e; // Let it fly a little bit further

Modified: branches/trac327/src/lib/asiolink/asiolink.cc
==============================================================================
--- branches/trac327/src/lib/asiolink/asiolink.cc (original)
+++ branches/trac327/src/lib/asiolink/asiolink.cc Thu Dec  9 16:56:59 2010
@@ -140,10 +140,12 @@
 
     void addServer(uint16_t port, const ip::address& address) {
         try {
+            dlog(std::string("Initialize TCP server at ") + address.to_string() + ":" + boost::lexical_cast<string>(port));
             TCPServerPtr tcpServer(new TCPServer(io_service_.get_io_service(),
                 address, port, checkin_, lookup_, answer_));
             (*tcpServer)();
             servers_.push_back(tcpServer);
+            dlog(std::string("Initialize UDP server at ") + address.to_string() + ":" + boost::lexical_cast<string>(port));
             UDPServerPtr udpServer(new UDPServer(io_service_.get_io_service(),
                 address, port, checkin_, lookup_, answer_));
             (*udpServer)();