From 1f29466a28d6ede438b8e37737855328b1512ed8 Mon Sep 17 00:00:00 2001 From: charles-gauthereau Date: Thu, 3 Sep 2026 17:22:03 +0200 Subject: [PATCH 1/2] fix: cron crash for databases setup from dashboard --- docker-compose.yml | 10 +++++----- src/utils/task_manager/scheduler.rs | 7 ++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e84f924..621826a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,19 +9,19 @@ services: - .:/app - cargo-registry:/usr/local/cargo/registry - cargo-git:/usr/local/cargo/git - - ./databases.json:/config/config.json +# - ./databases.json:/config/config.json #- ./databases.toml:/config/config.toml - - /var/run/docker.sock:/var/run/docker.sock +# - /var/run/docker.sock:/var/run/docker.sock # - cargo-target:/app/target - - databases_sqlite-data:/sqlite-data/workspace/data - - ./scripts/sqlite/test-db:/sqlite-data-2/workspace/data +# - databases_sqlite-data:/sqlite-data/workspace/data +# - ./scripts/sqlite/test-db:/sqlite-data-2/workspace/data # - /bigdisk:/scratch environment: APP_ENV: development LOG: debug TZ: "Europe/Paris" # TMPDIR: /scratch - EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiY2UxNjRiZDItZGZkMy00YzY4LThlZGItNmQ3OTczODAzZWEyIiwibWFzdGVyS2V5QjY0IjoiMUh0djdtWCtYVkJxL0IzUEV2WDlZZjlQeUdVZW5oRHlXemo5THRqNW90WT0ifQ==" + EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiOWMxMzM5NjItMGE5OC00MmRkLTk1NjUtOTA5ZTkyYTI5N2VkIiwibWFzdGVyS2V5QjY0IjoiMUh0djdtWCtYVkJxL0IzUEV2WDlZZjlQeUdVZW5oRHlXemo5THRqNW90WT0ifQ==" #CHUNK_SIZE_MB: "1" #POOLING: 1 #RETRY_ATTEMPTS: 3 diff --git a/src/utils/task_manager/scheduler.rs b/src/utils/task_manager/scheduler.rs index 2972f60..c1d248c 100644 --- a/src/utils/task_manager/scheduler.rs +++ b/src/utils/task_manager/scheduler.rs @@ -79,7 +79,12 @@ pub async fn execute_task( let ctx = Arc::new(Context::new()); let config_service = ConfigService::new(ctx.clone()); let backup_service = BackupService::new(ctx.clone()); - let config = config_service.load(None).unwrap(); + + let local = config_service.load_optional(None); + let cache_path = std::path::PathBuf::from(&crate::settings::CONFIG.data_path) + .join("dashboard_databases.json"); + let dashboard = crate::services::dashboard_config::load_cache(&cache_path); + let config = crate::services::dashboard_config::merge(&local.databases, &dashboard); let metadata_obj = metadata .into_iter() From 0fe4d50cbdb08f3546e2bb168510c0646e18932e Mon Sep 17 00:00:00 2001 From: charles-gauthereau Date: Thu, 3 Sep 2026 17:38:35 +0200 Subject: [PATCH 2/2] fix: docker-compose.yml --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 621826a..4b21c79 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,12 +9,12 @@ services: - .:/app - cargo-registry:/usr/local/cargo/registry - cargo-git:/usr/local/cargo/git -# - ./databases.json:/config/config.json + - ./databases.json:/config/config.json #- ./databases.toml:/config/config.toml -# - /var/run/docker.sock:/var/run/docker.sock + - /var/run/docker.sock:/var/run/docker.sock # - cargo-target:/app/target -# - databases_sqlite-data:/sqlite-data/workspace/data -# - ./scripts/sqlite/test-db:/sqlite-data-2/workspace/data + - databases_sqlite-data:/sqlite-data/workspace/data + - ./scripts/sqlite/test-db:/sqlite-data-2/workspace/data # - /bigdisk:/scratch environment: APP_ENV: development