diff --git a/docker-compose.yml b/docker-compose.yml index e84f924..4b21c79 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: 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()