diff --git a/consumer/src/backfill/mod.rs b/consumer/src/backfill/mod.rs index fd4a0d2b..48f3e188 100644 --- a/consumer/src/backfill/mod.rs +++ b/consumer/src/backfill/mod.rs @@ -53,7 +53,7 @@ impl BackfillManager { index_client: Option, opts: BackfillConfig, ) -> eyre::Result { - let semaphore = Arc::new(Semaphore::new(opts.backfill_workers as usize)); + let semaphore = Arc::new(Semaphore::new(opts.workers as usize)); Ok(BackfillManager { pool, diff --git a/consumer/src/config.rs b/consumer/src/config.rs index 8a6a9c6d..e94834c7 100644 --- a/consumer/src/config.rs +++ b/consumer/src/config.rs @@ -34,7 +34,7 @@ pub struct IndexerConfig { pub relay_source: String, pub history_mode: HistoryMode, #[serde(default = "default_indexer_workers")] - pub indexer_workers: u8, + pub workers: u8, pub start_commit_seq: Option, /// Whether to resolve handles as part of `#identity` events. /// You can use this to move handle resolution out of event handling and into another place. @@ -57,7 +57,7 @@ pub enum HistoryMode { #[derive(Clone, Debug, Deserialize)] pub struct BackfillConfig { #[serde(default = "default_backfill_workers")] - pub backfill_workers: u8, + pub workers: u8, #[serde(default)] pub skip_aggregation: bool, #[serde(default = "default_download_workers")] diff --git a/consumer/src/main.rs b/consumer/src/main.rs index c1482b34..571608c4 100644 --- a/consumer/src/main.rs +++ b/consumer/src/main.rs @@ -129,7 +129,7 @@ async fn main() -> eyre::Result<()> { ) .await?; - tracker.spawn(relay_indexer.run(indexer_cfg.indexer_workers, stop)); + tracker.spawn(relay_indexer.run(indexer_cfg.workers, stop)); tracker.spawn(index_transport(index_client, idxc_rx)); } diff --git a/parakeet/src/config.rs b/parakeet/src/config.rs index c07e66c1..b8b92cb4 100644 --- a/parakeet/src/config.rs +++ b/parakeet/src/config.rs @@ -15,7 +15,7 @@ pub(crate) fn load_config() -> eyre::Result { pub struct Config { pub index_uri: String, pub database_url: String, - pub cache_uri: String, + pub redis_uri: String, #[serde(default)] pub server: ConfigServer, pub service: ConfigService, diff --git a/parakeet/src/main.rs b/parakeet/src/main.rs index 7b386766..b98272ed 100644 --- a/parakeet/src/main.rs +++ b/parakeet/src/main.rs @@ -49,7 +49,7 @@ async fn main() -> eyre::Result<()> { tracing::info!("database migrations complete"); } - let redis_client = redis::Client::open(conf.cache_uri)?; + let redis_client = redis::Client::open(conf.redis_uri)?; let redis_mp = redis_client.get_multiplexed_tokio_connection().await?; let index_client = parakeet_index::Client::connect(conf.index_uri).await?;