Browse Source

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


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac327@3786 e5f2f494-b856-4b98-b285-d166d9295462

Jelte Jansen 14 years ago
parent
commit
a652352bd1
3 changed files with 5 additions and 3 deletions
  1. 0 1
      src/bin/recurse/main.cc
  2. 3 2
      src/bin/recurse/recursor.cc
  3. 2 0
      src/lib/asiolink/asiolink.cc

+ 0 - 1
src/bin/recurse/main.cc

@@ -164,7 +164,6 @@ main(int argc, char* argv[]) {
         }
 
         recursor->setConfigSession(config_session);
-        recursor->updateConfig(config_session->getFullConfig());
         dlog("Config loaded");
 
         dlog("Server started.");

+ 3 - 2
src/bin/recurse/recursor.cc

@@ -577,12 +577,13 @@ Recursor::setListenAddresses(const vector<addr_t>& addresses) {
          * 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

+ 2 - 0
src/lib/asiolink/asiolink.cc

@@ -140,10 +140,12 @@ public:
 
     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)();