Merge branch 'adamrankin-master'

openigtlink · Oct 15, 2015 · ccb2438 · ccb2438
2 parents 5a50181 + 8191f88
commit ccb2438
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Source/igtlClientSocket.cxx b/Source/igtlClientSocket.cxx
@@ -41,7 +41,7 @@ ClientSocket::~ClientSocket()
 }
 
 //-----------------------------------------------------------------------------
-int ClientSocket::ConnectToServer(const char* hostName, int port)
+int ClientSocket::ConnectToServer(const char* hostName, int port, bool logErrorIfServerConnectionFailed /*= true*/)
 {
   if (this->m_SocketDescriptor != -1)
     {
@@ -62,7 +62,10 @@ int ClientSocket::ConnectToServer(const char* hostName, int port)
     this->CloseSocket(this->m_SocketDescriptor);
     this->m_SocketDescriptor = -1;
 
-    igtlErrorMacro("Failed to connect to server " << hostName << ":" << port);
+    if( logErrorIfServerConnectionFailed )
+      {
+      igtlErrorMacro("Failed to connect to server " << hostName << ":" << port);
+      }
     return -1;
     }
   return 0;

diff --git a/Source/igtlClientSocket.h b/Source/igtlClientSocket.h
@@ -50,7 +50,7 @@ class IGTLCommon_EXPORT ClientSocket : public Socket
   igtlNewMacro(igtl::ClientSocket);
 
   /// Connects to host. Returns 0 on success, -1 on error.
-  int ConnectToServer(const char* hostname, int port); 
+  int ConnectToServer(const char* hostname, int port, bool logErrorIfServerConnectionFailed = true); 
 
 protected:
   ClientSocket();