Merge pull request #324 from shilpa24balaji/3.12_p3b

Update retry time in connection-health-file

CHANGELOG.md

@@ -13,7 +13,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Update to use nanomsg v. 1.1.4
 - requestNewAuthToken will clear the token if it fails.
 - request auth token on every retry, not just after 403
-- update to use nopoll v 1.0.2
 
 ## [1.0.2] - 2019-02-08
 - Refactored connection.c and updated corresponding unit tests

CMakeLists.txt

@@ -84,8 +84,8 @@ add_dependencies(libtrower-base64 trower-base64)
 #-------------------------------------------------------------------------------
 ExternalProject_Add(nopoll
     PREFIX ${PREFIX_DIR}/nopoll
-    GIT_REPOSITORY https://github.com/bill1600/nopoll.git
-    GIT_TAG "nopoll_poll"
+    GIT_REPOSITORY https://github.com/Comcast/nopoll.git
+    GIT_TAG "1.0.1"
     CONFIGURE_COMMAND COMMAND <SOURCE_DIR>/autogen.sh --prefix=${PREFIX}
                                                      --includedir=${INCLUDE_DIR}
                                                      --libdir=${LIBRARY_DIR}

src/connection.c

@@ -214,6 +214,13 @@ int update_backoff_delay (backoff_timer_t *timer)
 static void backoff_delay (backoff_timer_t *timer)
 {
   update_backoff_delay (timer);
+
+  // Update retry time for conn progress
+  if(timer->count == timer->max_count) 
+  {
+	start_conn_in_progress();
+  }
+
   ParodusInfo("Waiting with backoffRetryTime %d seconds\n", timer->delay);
   sleep (timer->delay);
 }