commit 9ae8857bce2ffd1718a85cb6163300541157ab7f
author Qi Zhao <qi.zhao@cs.ucla.edu> Tue May 23 10:54:01 2017 -0700
committer Qi Zhao <qi.zhao@cs.ucla.edu> Tue May 23 16:19:31 2017 -0700
tree f3e23246cb98ac362af880de1c4868e367bdd34c
parent a94f3676c3acba22da888014f2189ff33588208b

tools: fix the inconsistent logging among ndn-autoconfig stages

refs #4079

Change-Id: Ie1edd8d30dbe7a9f5bf7b3364a07e71910cd91eb

tools/ndn-autoconfig/ndn-fch-discovery.cpp

diff --git a/tools/ndn-autoconfig/ndn-fch-discovery.cpp b/tools/ndn-autoconfig/ndn-fch-discovery.cpp
index 56b7fd1..13dd3ab 100644
--- a/tools/ndn-autoconfig/ndn-fch-discovery.cpp
+++ b/tools/ndn-autoconfig/ndn-fch-discovery.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2016,  Regents of the University of California,
+ * Copyright (c) 2014-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -143,6 +143,8 @@
 void
 NdnFchDiscovery::start()
 {
+  std::cerr << "Trying NDN-FCH service..." << std::endl;
+
   try {
     using namespace boost::asio::ip;
     tcp::iostream requestStream;
@@ -186,12 +188,11 @@
 
     std::getline(responseStream, statusMessage);
     if (!static_cast<bool>(requestStream) || httpVersion.substr(0, 5) != "HTTP/") {
-      throw HttpException("HTTP communication error");
+      BOOST_THROW_EXCEPTION(HttpException("HTTP communication error"));
     }
     if (statusCode != 200) {
       boost::trim(statusMessage);
-      throw HttpException("HTTP request failed: " +
-                          std::to_string(statusCode) + " " + statusMessage);
+      BOOST_THROW_EXCEPTION(HttpException("HTTP request failed: " + std::to_string(statusCode) + " " + statusMessage));
     }
     std::string header;
     while (std::getline(requestStream, header) && header != "\r")
@@ -201,7 +202,7 @@
     requestStream >> hubHost;
 
     if (hubHost.empty()) {
-      throw HttpException("NDN-FCH did not return hub host");
+      BOOST_THROW_EXCEPTION(HttpException("NDN-FCH did not return hub host"));
     }
 
     this->connectToHub("udp://" + hubHost);