Merge branch 'hotfix/1.32.3' into develop

Author: danovaro

VERSION

@@ -1 +1 @@
-1.32.2
+1.32.3

src/eckit/net/ProxiedTCPClient.cc

@@ -23,8 +23,8 @@ ProxiedTCPClient::ProxiedTCPClient(const std::string& proxyHost, int proxyPort,
 
 ProxiedTCPClient::~ProxiedTCPClient() {}
 
-net::TCPSocket& ProxiedTCPClient::connect(const std::string& host, int port, int retries, int timeout) {
-    net::TCPSocket& socket = TCPClient::connect(proxy_.hostname(), proxy_.port(), retries, timeout);
+net::TCPSocket& ProxiedTCPClient::connect(const std::string& host, int port, int retries, int timeout, int retryDelay) {
+    net::TCPSocket& socket = TCPClient::connect(proxy_.hostname(), proxy_.port(), retries, timeout, retryDelay);
 
     socket.debug(debug_.on);
 

src/eckit/net/ProxiedTCPClient.h

@@ -29,7 +29,7 @@ class ProxiedTCPClient : public net::TCPClient {
     ~ProxiedTCPClient() override;
 
     using net::TCPClient::connect;
-    net::TCPSocket& connect(const std::string& host, int port, int retries = 5, int timeout = 0) override;
+    net::TCPSocket& connect(const std::string& host, int port, int retries = 5, int timeout = 0, int retryDelay = 5) override;
 
 private:
 

src/eckit/net/TCPClient.cc

@@ -34,8 +34,8 @@ void TCPClient::print(std::ostream& s) const {
 }
 
 /// @note TCPClient::connect(host, port, retries, timeout) is found in TCPSocket.cc
-TCPSocket& TCPClient::connect(const net::Endpoint& endpoint, int retries, int timeout) {
-    return connect(endpoint.hostname(), endpoint.port(), retries, timeout);
+TCPSocket& TCPClient::connect(const net::Endpoint& endpoint, int retries, int timeout, int retryDelay) {
+    return connect(endpoint.hostname(), endpoint.port(), retries, timeout, retryDelay);
 }
 
 }  // namespace eckit::net

src/eckit/net/TCPClient.h

@@ -29,8 +29,8 @@ class TCPClient : public TCPSocket, private eckit::NonCopyable {
 
     ~TCPClient();
 
-    virtual TCPSocket& connect(const std::string& host, int port, int retries = 5, int timeout = 0);
-    virtual TCPSocket& connect(const net::Endpoint& endpoint, int retries = 5, int timeout = 0);
+    virtual TCPSocket& connect(const std::string& host, int port, int retries = 5, int timeout = 0, int retryDelay = 5);
+    virtual TCPSocket& connect(const net::Endpoint& endpoint, int retries = 5, int timeout = 0, int retryDelay = 5);
 
 protected:  // methods
 

src/eckit/net/TCPSocket.cc

@@ -314,7 +314,7 @@ static void catch_alarm(int) {
 // This should be in the TCPClient.cc, but I want to reuse the Mutex
 // to lock any call to NIS with the same one
 
-TCPSocket& TCPClient::connect(const std::string& remote, int port, int retries, int timeout) {
+TCPSocket& TCPClient::connect(const std::string& remote, int port, int retries, int timeout, int retryDelay) {
     std::string host = hostName(remote);
 
     in_addr_t addr;
@@ -411,7 +411,7 @@ TCPSocket& TCPClient::connect(const std::string& remote, int port, int retries,
                             throw TooManyRetries(tries);
                         }
                     }
-                    ::sleep(5);
+                    ::sleep(retryDelay);
                     break;
 
                 case EINPROGRESS: