Fix for v2 upgrade timeout issue

envkey · Mar 10, 2023 · f5d17f8 · f5d17f8
1 parent 12c3cdc
commit f5d17f8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.json b/CHANGELOG.json
@@ -180,5 +180,8 @@
   ],
   "1.5.0": [
     "Seamless upgrades to EnvKey v2"
+  ],
+  "1.5.1": [
+    "Fix for v2 upgrade timeout issue"
   ]
 }
diff --git a/envkey-electron/package.json b/envkey-electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "EnvKey",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "EnvKey's cross-platform native app",
   "author": "Dane Schneider <dane@envkey.com> (https://www.envkey.com)",
   "homepage": "https://www.envkey.com",

diff --git a/envkey-react/src/sagas/v2_upgrade_sagas.js b/envkey-react/src/sagas/v2_upgrade_sagas.js
@@ -71,6 +71,7 @@ import {signTrustedPubkeyChain} from "./helpers/crypto_helpers"
 
 const V2_BASE_URL = "http://localhost:19047"
 const V2_REQUEST_HEADERS = {}
+const V2_CORE_PROC_TIMEOUT = 30000
 
 const onStartV2UpgradeRequest = apiSaga({
   authenticated: true,
@@ -120,7 +121,7 @@ function *onCheckV2CoreProcAlive(action){
     res = yield axios({
       method: "get",
       url: `${V2_BASE_URL}/alive`,
-      timeout: 3000,
+      timeout: V2_CORE_PROC_TIMEOUT,
       headers: V2_REQUEST_HEADERS,
     })
   } catch (err) {
@@ -185,7 +186,7 @@ function *onCheckV2UpgradeStatus(action){
     res = yield axios({
       method: "get",
       url: `${V2_BASE_URL}/v1-upgrade-status`,
-      timeout: 3000,
+      timeout: V2_CORE_PROC_TIMEOUT,
       headers
     })
   } catch (err) {