backup sites: fix listing when status call errors

* fix backend to not retry in status call
* fix frontend to continue loading view if status errors
* fix connect-lastmile to show the exact path that is timing out
This commit is contained in:
Girish Ramakrishnan
2025-10-16 14:03:08 +02:00
parent 8aa5dc85af
commit d6a4dd6965
4 changed files with 8 additions and 11 deletions

View File

@@ -226,12 +226,9 @@ async function refresh() {
site.status = { busy: true, state: '', message: '' };
const [error, status] = await backupSitesModels.status(site.id);
if (error) {
console.error(error);
continue;
}
if (error) console.error(error);
site.status.state = status.state === 'active' ? 'success' : 'danger';
site.status.state = status?.state === 'active' ? 'success' : 'danger';
site.status.busy = false;
const [taskError, tasks] = await tasksModel.getByType(TASK_TYPES.TASK_FULL_BACKUP_PREFIX + site.id);

8
package-lock.json generated
View File

@@ -11,7 +11,7 @@
"@aws-sdk/client-route-53": "^3.901.0",
"@aws-sdk/client-s3": "^3.901.0",
"@aws-sdk/lib-storage": "^3.901.0",
"@cloudron/connect-lastmile": "^2.2.1",
"@cloudron/connect-lastmile": "^2.3.0",
"@cloudron/manifest-format": "^5.28.0",
"@cloudron/superagent": "^1.0.0",
"@google-cloud/dns": "^5.3.0",
@@ -1135,9 +1135,9 @@
"license": "Apache-2.0"
},
"node_modules/@cloudron/connect-lastmile": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/@cloudron/connect-lastmile/-/connect-lastmile-2.2.1.tgz",
"integrity": "sha512-hi5AcFHQNu0HrJM32vCq3kyEv4qJfAUgU6XSCCOYQ/E+CLQzz9VTH6gqx0kmQpsVtwV5ji6nVGONHTj7MHu1Og==",
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/@cloudron/connect-lastmile/-/connect-lastmile-2.3.0.tgz",
"integrity": "sha512-0Lr6tleJUKvQuJk4qgP6EfqjBYPrU/aAR4WgqMa6IYCR1fKcjtrLbNFhs/cKbqgBCRLZOPmMg9jjxWPhfJasmA==",
"license": "MIT"
},
"node_modules/@cloudron/manifest-format": {

View File

@@ -15,7 +15,7 @@
"@aws-sdk/client-route-53": "^3.901.0",
"@aws-sdk/client-s3": "^3.901.0",
"@aws-sdk/lib-storage": "^3.901.0",
"@cloudron/connect-lastmile": "^2.2.1",
"@cloudron/connect-lastmile": "^2.3.0",
"@cloudron/manifest-format": "^5.28.0",
"@cloudron/superagent": "^1.0.0",
"@google-cloud/dns": "^5.3.0",

View File

@@ -161,7 +161,7 @@ async function getAvailableSize(apiConfig) {
async function getStatus(apiConfig) {
assert.strictEqual(typeof apiConfig, 'object');
const s3 = createS3Client(apiConfig, { retryStrategy: RETRY_STRATEGY });
const s3 = createS3Client(apiConfig, { retryStrategy: null });
const listParams = {
Bucket: apiConfig.bucket,