Modified open_connection logic when the helper_active connection is failed

Change-Id: I2f6585c8de65939af5907c26b0600612e86bf181

diff --git a/ism/src/scim_helper.cpp b/ism/src/scim_helper.cpp
index cd77f26b053d341b657417ca7bb61fa9b5b4e9bc..629f700c60d4db911174f7ec3a5968bbda4d8b35 100644 (file)
--- a/ism/src/scim_helper.cpp
+++ b/ism/src/scim_helper.cpp
@@ -705,14 +705,30 @@ HelperAgent::open_connection (const HelperInfo &info,
 
     /* connect to the panel agent as the active helper client */
     if (!m_impl->socket_active.connect (address)) return -1;
-    if (!scim_socket_open_connection (magic,
+    open_connection_retries = 0;
+    while (!scim_socket_open_connection (magic,
                                       String ("Helper_Active"),
                                       String ("Panel"),
                                       m_impl->socket_active,
                                       timeout)) {
-        m_impl->socket_active.close ();
-        ISF_SAVE_LOG ("Helper_Active scim_socket_open_connection() failed %d\n", timeout);
-        return -1;
+        if (++open_connection_retries > 10) {
+            m_impl->socket_active.close ();
+            std::cerr << "Helper_Active scim_socket_open_connection () is failed!!!\n";
+            ISF_LOG ("Helper_Active scim_socket_open_connection () is failed!!!\n");
+            ISF_SAVE_LOG ("Helper_Active scim_socket_open_connection failed, %d\n", timeout);
+
+            return -1;
+        }
+
+        /* Retry after re-connecting the socket */
+        if (m_impl->socket_active.is_connected ())
+            m_impl->socket_active.close ();
+
+        /* This time, just retry atmost 2 seconds */
+        i = 0;
+        while (!m_impl->socket_active.connect (address) && ++i < 10) {
+            scim_usleep (200000);
+        }
     }
 
     m_impl->magic_active = magic;