diff --git a/backend/src/context/rpc.rs b/backend/src/context/rpc.rs index 9dcd53dc9..dadef1d8e 100644 --- a/backend/src/context/rpc.rs +++ b/backend/src/context/rpc.rs @@ -100,7 +100,14 @@ impl RpcContextConfig { .with_kind(crate::ErrorKind::Database)?; let old_db_path = self.datadir().join("main/secrets.db"); if tokio::fs::metadata(&old_db_path).await.is_ok() { - pgloader(&old_db_path).await?; + let mut res = Ok(()); + for _ in 0..5 { + res = pgloader(&old_db_path).await; + if res.is_ok() { + break; + } + } + res? } Ok(secret_store) } diff --git a/backend/src/context/setup.rs b/backend/src/context/setup.rs index 61a3636f8..5b19f9e95 100644 --- a/backend/src/context/setup.rs +++ b/backend/src/context/setup.rs @@ -141,7 +141,14 @@ impl SetupContext { .with_kind(crate::ErrorKind::Database)?; let old_db_path = self.datadir.join("main/secrets.db"); if tokio::fs::metadata(&old_db_path).await.is_ok() { - pgloader(&old_db_path).await?; + let mut res = Ok(()); + for _ in 0..5 { + res = pgloader(&old_db_path).await; + if res.is_ok() { + break; + } + } + res? } Ok(secret_store) } diff --git a/frontend/patchdb-ui-seed.json b/frontend/patchdb-ui-seed.json index e31279b82..8d9a52ff3 100644 --- a/frontend/patchdb-ui-seed.json +++ b/frontend/patchdb-ui-seed.json @@ -2,7 +2,7 @@ "name": null, "auto-check-updates": true, "pkg-order": [], - "ack-welcome": "0.3.0", + "ack-welcome": "0.3.2", "marketplace": { "selected-id": null, "known-hosts": {}