Skip to content

Log the error returned from SqliteStore::new and fs::create_dir_all #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 2 commits into from
May 5, 2026
+22 −9
Merged

Log the error returned from SqliteStore::new and fs::create_dir_all #893

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7df1736
Log the error returned from `SqliteStore::new` and `fs::create_dir_all`
tankyleo Apr 30, 2026
5cd7eed
Add `NodeBuilder::build_with_store_and_logger`
tankyleo May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@ impl NodeBuilder {
/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
/// previously configured.
pub fn build(&self, node_entropy: NodeEntropy) -> Result<Node, BuildError> {
let logger = setup_logger(&self.log_writer_config, &self.config)?;
let storage_dir_path = self.config.storage_dir_path.clone();
fs::create_dir_all(storage_dir_path.clone())
.map_err(|_| BuildError::StoragePathAccessFailed)?;
Expand All @@ -636,20 +637,26 @@ impl NodeBuilder {
Some(io::sqlite_store::SQLITE_DB_FILE_NAME.to_string()),
Some(io::sqlite_store::KV_TABLE_NAME.to_string()),
)
.map_err(|_| BuildError::KVStoreSetupFailed)?;
self.build_with_store(node_entropy, kv_store)
.map_err(|e| {
log_error!(logger, "Failed to setup Sqlite store: {}", e);
Copy link
Copy Markdown
Contributor

@benthecarman benthecarman May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: here and below

Suggested change
log_error!(logger, "Failed to setup Sqlite store: {}", e);
log_error!(logger, "Failed to set up Sqlite store: {}", e);

Copy link
Copy Markdown
Collaborator

@tnull tnull May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll land this shortly to keep moving, but feel free to add a commit addressing the nit in #863.

BuildError::KVStoreSetupFailed
})?;
self.build_with_store_and_logger(node_entropy, kv_store, logger)
}

/// Builds a [`Node`] instance with a [`FilesystemStore`] backend and according to the options
/// previously configured.
pub fn build_with_fs_store(&self, node_entropy: NodeEntropy) -> Result<Node, BuildError> {
let logger = setup_logger(&self.log_writer_config, &self.config)?;
let mut storage_dir_path: PathBuf = self.config.storage_dir_path.clone().into();
storage_dir_path.push("fs_store");

fs::create_dir_all(storage_dir_path.clone())
.map_err(|_| BuildError::StoragePathAccessFailed)?;
fs::create_dir_all(storage_dir_path.clone()).map_err(|e| {
log_error!(logger, "Failed to setup Filesystem store: {}", e);
BuildError::StoragePathAccessFailed
})?;
let kv_store = FilesystemStore::new(storage_dir_path);
self.build_with_store(node_entropy, kv_store)
self.build_with_store_and_logger(node_entropy, kv_store, logger)
}

/// Builds a [`Node`] instance with a [VSS] backend and according to the options
Expand Down Expand Up @@ -680,7 +687,7 @@ impl NodeBuilder {
BuildError::KVStoreSetupFailed
})?;

self.build_with_store(node_entropy, vss_store)
self.build_with_store_and_logger(node_entropy, vss_store, logger)
}

/// Builds a [`Node`] instance with a [VSS] backend and according to the options
Expand Down Expand Up @@ -717,7 +724,7 @@ impl NodeBuilder {
BuildError::KVStoreSetupFailed
})?;

self.build_with_store(node_entropy, vss_store)
self.build_with_store_and_logger(node_entropy, vss_store, logger)
}

/// Builds a [`Node`] instance with a [VSS] backend and according to the options
Expand All @@ -744,7 +751,7 @@ impl NodeBuilder {
BuildError::KVStoreSetupFailed
})?;

self.build_with_store(node_entropy, vss_store)
self.build_with_store_and_logger(node_entropy, vss_store, logger)
}

/// Builds a [`Node`] instance with a [VSS] backend and according to the options
Expand All @@ -769,7 +776,7 @@ impl NodeBuilder {
BuildError::KVStoreSetupFailed
})?;

self.build_with_store(node_entropy, vss_store)
self.build_with_store_and_logger(node_entropy, vss_store, logger)
}

/// Builds a [`Node`] instance according to the options previously configured.
Expand All @@ -778,6 +785,12 @@ impl NodeBuilder {
) -> Result<Node, BuildError> {
let logger = setup_logger(&self.log_writer_config, &self.config)?;

self.build_with_store_and_logger(node_entropy, kv_store, logger)
}

fn build_with_store_and_logger<S: SyncAndAsyncKVStore + Send + Sync + 'static>(
&self, node_entropy: NodeEntropy, kv_store: S, logger: Arc<Logger>,
) -> Result<Node, BuildError> {
let runtime = if let Some(handle) = self.runtime_handle.as_ref() {
Arc::new(Runtime::with_handle(handle.clone(), Arc::clone(&logger)))
} else {
Expand Down
Loading