set ziti controller timeout (#196)

openziti · Dec 4, 2020 · 279ecbe · 279ecbe
1 parent 04db6fe
commit 279ecbe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -4,7 +4,7 @@ include(FetchContent)
 
 FetchContent_Declare(uv-mbed
         GIT_REPOSITORY https://github.com/netfoundry/uv-mbed.git
-        GIT_TAG v0.9.2
+        GIT_TAG v0.10.0
         )
 set(ENABLE_UM_TESTS OFF CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(uv-mbed)

diff --git a/library/ziti.c b/library/ziti.c
@@ -625,7 +625,7 @@ static void session_cb(ziti_session *session, ziti_error *err, void *ctx) {
             uv_timer_stop(&ztx->refresh_timer);
         }
 
-    } else {
+    } else if (err) {
         if (ztx->session) {
             ZITI_LOG(WARN, "failed to refresh: %s[%d]", err->code, errCode);
             if (strcmp(err->code, "UNAUTHORIZED") == 0) {
@@ -646,6 +646,8 @@ static void session_cb(ziti_session *session, ziti_error *err, void *ctx) {
 
             model_map_clear(&ztx->services, (_free_f) free_ziti_service);
         }
+    } else {
+        ZITI_LOG(ERROR, "%s: no session or error received", ziti_errorstr(ZITI_WTF));
     }
 
     if (init_req->init_cb) {

diff --git a/library/ziti_ctrl.c b/library/ziti_ctrl.c
@@ -22,6 +22,8 @@ limitations under the License.
 #include <uv_mbed/um_http.h>
 
 #define DEFAULT_PAGE_SIZE 25
+#define ZITI_CTRL_KEEPALIVE -1
+#define ZITI_CTRL_TIMEOUT 10000
 
 const char *const PC_DOMAIN_TYPE = "DOMAIN";
 const char *const PC_OS_TYPE = "OS";
@@ -260,7 +262,8 @@ static void ctrl_body_cb(um_http_req_t *req, const char *b, ssize_t len) {
 int ziti_ctrl_init(uv_loop_t *loop, ziti_controller *ctrl, const char *url, tls_context *tls) {
     um_http_init(loop, &ctrl->client, url);
     um_http_set_ssl(&ctrl->client, tls);
-    um_http_idle_keepalive(&ctrl->client, 0);
+    um_http_idle_keepalive(&ctrl->client, ZITI_CTRL_KEEPALIVE);
+    um_http_connect_timeout(&ctrl->client, ZITI_CTRL_TIMEOUT);
     um_http_header(&ctrl->client, "Accept", "application/json");
     ctrl->session = NULL;