From 9f6ae9807e411959735e014784597631770773dc Mon Sep 17 00:00:00 2001 From: Andrey Borysenko Date: Tue, 2 Jul 2024 20:05:49 +0300 Subject: [PATCH 1/3] fix(settings): set ping timeout to 3s Signed-off-by: Andrey Borysenko --- lib/DeployActions/DockerActions.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/DeployActions/DockerActions.php b/lib/DeployActions/DockerActions.php index 6c7918ee..068a4469 100644 --- a/lib/DeployActions/DockerActions.php +++ b/lib/DeployActions/DockerActions.php @@ -418,7 +418,9 @@ public function removeVolume(string $dockerUrl, string $volume): array { public function ping(string $dockerUrl): bool { $url = $this->buildApiUrl($dockerUrl, '_ping'); try { - $response = $this->guzzleClient->get($url); + $response = $this->guzzleClient->get($url, [ + 'timeout' => 3, + ]); if ($response->getStatusCode() === 200) { return true; } From db4eb93995b0e85999217be4cbcffea95d37c76c Mon Sep 17 00:00:00 2001 From: Andrey Borysenko Date: Tue, 2 Jul 2024 20:06:25 +0300 Subject: [PATCH 2/3] fix(exapps): allow disable and remove if daemon not accessible Signed-off-by: Andrey Borysenko --- src/components/Apps/AppDetails.vue | 4 ++-- src/components/Apps/AppItem.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Apps/AppDetails.vue b/src/components/Apps/AppDetails.vue index ffae9d39..893f2034 100644 --- a/src/components/Apps/AppDetails.vue +++ b/src/components/Apps/AppDetails.vue @@ -13,13 +13,13 @@ class="uninstall" type="button" :value="t('settings', 'Remove')" - :disabled="installing || isLoading || !defaultDeployDaemonAccessible" + :disabled="installing || isLoading" @click="remove(app.id, removeData)"> {{ t('settings', 'Remove') }} {{ disableButtonText }} From 6ca85922a96b88fcf58f3f5743ee89a586145f5b Mon Sep 17 00:00:00 2001 From: Andrey Borysenko Date: Tue, 2 Jul 2024 20:19:57 +0300 Subject: [PATCH 3/3] update changelog Signed-off-by: Andrey Borysenko --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3be3fb03..486f4f75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [2.7.1 - 2024-07-xx] + +### Fixed + +- Allow ExApps management disable and remove actions if default Deploy daemon is not accessible. #314 +- Fixed Deploy daemon avilability check using ping timeout set to 3s. #314 + ## [2.7.0 - 2024-07-01] ### Fixed