From 588cdca5a6c278a71faa8d0235ae6ba7d0b51ee5 Mon Sep 17 00:00:00 2001 From: Marc Tyndel Date: Mon, 5 Jun 2023 13:54:51 -0400 Subject: [PATCH] quick fix to be able to set the caches path via env variables like we do for the DB and bitcoind configuration --- src/config.rs | 9 +++++++-- src/snapshot.rs | 9 +++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/config.rs b/src/config.rs index 1f968d6..bf5a171 100644 --- a/src/config.rs +++ b/src/config.rs @@ -30,8 +30,13 @@ pub(crate) fn network() -> Network { } } -pub(crate) fn network_graph_cache_path() -> &'static str { - "./res/network_graph.bin" +pub(crate) fn network_graph_cache_path() -> String { + format!("{}/network_graph.bin", cache_path()) +} + +pub(crate) fn cache_path() -> String { + let path = env::var("RAPID_GOSSIP_SYNC_SERVER_CACHES_PATH").unwrap_or("./res".to_string()).to_lowercase(); + path } pub(crate) fn db_connection_config() -> Config { diff --git a/src/snapshot.rs b/src/snapshot.rs index 86115ea..bbe94a9 100644 --- a/src/snapshot.rs +++ b/src/snapshot.rs @@ -7,6 +7,7 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH}; use lightning::routing::gossip::NetworkGraph; use crate::{config, TestLogger}; +use crate::config::cache_path; pub(crate) struct Snapshotter { network_graph: Arc>, @@ -23,10 +24,10 @@ impl Snapshotter { let snapshot_sync_day_factors = [1, 2, 3, 4, 5, 6, 7, 14, 21, u64::MAX]; let round_day_seconds = config::SNAPSHOT_CALCULATION_INTERVAL as u64; - let pending_snapshot_directory = "./res/snapshots_pending"; - let pending_symlink_directory = "./res/symlinks_pending"; - let finalized_snapshot_directory = "./res/snapshots"; - let finalized_symlink_directory = "./res/symlinks"; + let pending_snapshot_directory = format!("{}/snapshots_pending", cache_path()); + let pending_symlink_directory = format!("{}/symlinks_pending", cache_path()); + let finalized_snapshot_directory = format!("{}/snapshots", cache_path()); + let finalized_symlink_directory = format!("{}/symlinks", cache_path()); let relative_symlink_to_snapshot_path = "../snapshots"; // this is gonna be a never-ending background job -- 2.30.2