Changeset 11526

Timestamp:

07/22/11 08:45:50 (14 years ago)

Author:

tbretz

Message:

Moved output to Setup function; changed output contents; return localhost if none was detected.

File:

• trunk/FACT++/src/DimSetup.cc (modified) (5 diffs)

trunk/FACT++/src/DimSetup.cc

@@ -67 +67 @@
     if (ec)
     {
-        cout << "WARNING - Failure in name-resolution of '" << dns << ":0': ";
+        //cout << "WARNING - Failure in name-resolution of '" << dns << ":0': ";
+        cout << "WARNING - Could not resolve local ip address: ";
         cout << ec.message() << " (" << ec << ")" << endl;
         return dns;
@@ -78 +79 @@
         if (ec)
         {
-            cout << "WARNING - connect to '" << dns << ":0' failed: ";
+            cout << "WARNING - Could not resolve local ip address: ";
             cout << ec.message() << " (" << ec << ")" << endl;
             continue;
@@ -84 +85 @@
 
         const string addr = socket.local_endpoint().address().to_v4().to_string();
-        cout << "Setting DIM_HOST_NODE=" << addr << endl;
         return addr;
     }
 
-    return dns;
+    return "localhost";
 
 /*
@@ -160 +160 @@
 void Dim::Setup(const std::string &dns)
 {
-    setenv("DIM_DNS_NODE",  dns.c_str(),               1);
-    setenv("DIM_HOST_NODE", Dim::GetLocalIp().c_str(), 1);
+    const string loc = Dim::GetLocalIp().c_str();
 
-    cout << "Setting DIM_DNS_NODE=" << dns << endl;
+    setenv("DIM_DNS_NODE",  dns.c_str(), 1);
+    setenv("DIM_HOST_NODE", loc.c_str(), 1);
+
+    cout << "Setting DIM_DNS_NODE =" << dns << endl;
+    cout << "Setting DIM_HOST_NODE=" << loc << endl;
 }
 
@@ -172 +175 @@
         static string rc;
         rc = Dim::GetLocalIp();
+        cout << "Setting DIM_HOST_NODE=" << rc << endl;
         return rc.c_str();
     }