Merge pull request #44 from ecmwf/hotfix/1.11.8

Hotfix/1.11.8

Author: danovaro

VERSION

@@ -1 +1 @@
-1.11.7
+1.11.8

src/metkit/mars/DHSProtocol.cc

@@ -85,7 +85,7 @@ class SimpleCallback : public BaseCallbackConnection {
 public:
 
     SimpleCallback() :
-        callbackEndpoint_(net::IPAddress::hostAddress(callback_.localHost()).asString(), callback_.localPort()) {
+        callbackEndpoint_(computeEndpoint()) {
         LOG_DEBUG_LIB(LibMetkit) << "Simple callback. host=" << callbackEndpoint_.host()
                                  << " port=" << callbackEndpoint_.port() << std::endl;
     }
@@ -105,6 +105,19 @@ class SimpleCallback : public BaseCallbackConnection {
     net::EphemeralTCPServer callback_;
     Endpoint callbackEndpoint_;
 
+    Endpoint computeEndpoint() const {
+        static std::string callbackHost = Resource<std::string>("$MARS_DHS_CALLBACK_HOST", "");
+        static int callbackPort = Resource<int>("$MARS_DHS_CALLBACK_PORT", 0);
+
+        if (callbackHost.empty()) {
+            return Endpoint{net::IPAddress::hostAddress(callback_.localHost()).asString(), callback_.localPort()};
+        }
+        if (callbackPort == 0) {
+            return Endpoint{callbackHost, callback_.localPort()};
+        }
+        return Endpoint{callbackHost, callbackPort};
+    }
+
 public:
     static const ClassSpec&  classSpec() {
         static ClassSpec spec = {&BaseCallbackConnection::classSpec(), "SimpleCallback"};