mirror of
https://github.com/logos-blockchain/logos-execution-zone.git
synced 2026-07-10 07:50:11 +00:00
1c1e80f646
The indexer's storage location was the `home` field of IndexerConfig, used only to derive the RocksDB dir. Defaulting to "." meant it landed in the process CWD — fine for the standalone service, but wrong when the indexer runs embedded in a logos_host subprocess (RocksDB ended up in an arbitrary/unwritable dir). Storage location is an operational concern the host should own, not something baked into a user-editable config. Remove `home` from IndexerConfig and pass the storage directory explicitly: - core: `IndexerCore::new(config, storage_dir)` derives `<storage_dir>/rocksdb`. - ffi: `start_indexer(runtime, config_path, storage_dir)`; null/empty storage_dir falls back to ".". Lets a host (e.g. a Logos module's instance persistence path) own where state lives. - service: `run_server(config, storage_dir, port)` + a `--data-dir` flag (default ".") on the binary, preserving current behaviour. - drop `home` from the committed indexer config JSONs and the test fixtures. BREAKING CHANGE: `start_indexer` gains a `storage_dir` parameter and IndexerConfig no longer has a `home` field.
40 lines
1.2 KiB
Rust
40 lines
1.2 KiB
Rust
use std::{fs::File, io::BufReader, path::Path, time::Duration};
|
|
|
|
use anyhow::{Context as _, Result};
|
|
use common::config::BasicAuth;
|
|
use humantime_serde;
|
|
pub use logos_blockchain_core::mantle::ops::channel::ChannelId;
|
|
use serde::{Deserialize, Serialize};
|
|
use url::Url;
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct ClientConfig {
|
|
pub addr: Url,
|
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
|
pub auth: Option<BasicAuth>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct IndexerConfig {
|
|
#[serde(with = "humantime_serde")]
|
|
pub consensus_info_polling_interval: Duration,
|
|
pub bedrock_config: ClientConfig,
|
|
pub channel_id: ChannelId,
|
|
}
|
|
|
|
impl IndexerConfig {
|
|
pub fn from_path(config_path: &Path) -> Result<Self> {
|
|
let file = File::open(config_path).with_context(|| {
|
|
format!("Failed to open indexer config at {}", config_path.display())
|
|
})?;
|
|
let reader = BufReader::new(file);
|
|
|
|
serde_json::from_reader(reader).with_context(|| {
|
|
format!(
|
|
"Failed to parse indexer config at {}",
|
|
config_path.display()
|
|
)
|
|
})
|
|
}
|
|
}
|