Skip to content

Commit e7031df

Browse files
committed
Log TSIG and global state file paths
1 parent e8cc640 commit e7031df

2 files changed

Lines changed: 22 additions & 7 deletions

File tree

src/center.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,6 @@ impl State {
378378
let path = config.daemon.state_file.value();
379379
let spec = crate::state::Spec::load(path)?;
380380

381-
info!("Loaded the global state file (from '{path}')");
382-
383381
Ok(spec.parse(zones, policies))
384382
}
385383

src/main.rs

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,25 @@ fn main() -> ExitCode {
7878
let mut policies = Default::default();
7979
let state = match center::State::init_from_file(&config, &mut zones, &mut policies) {
8080
Ok(mut state) => {
81+
info!(
82+
"Loaded the global state file (from '{}')",
83+
config.daemon.state_file.value()
84+
);
85+
8186
// Load the TSIG store file.
8287
match state.tsig_store.init_from_file(&config) {
83-
Ok(()) => debug!("Loaded the TSIG store"),
88+
Ok(()) => debug!("Loaded the TSIG store (from '{}')", config.tsig_store_path),
8489
Err(err) if err.kind() == io::ErrorKind::NotFound => {
85-
debug!("No TSIG store found; will create one");
90+
debug!(
91+
"TSIG store file '{}' did not exist; it will be created",
92+
config.tsig_store_path
93+
);
8694
}
8795
Err(err) => {
88-
error!("Failed to load the TSIG store: {err}");
96+
error!(
97+
"TSIG store file '{}' could not be read: {err}",
98+
config.tsig_store_path
99+
);
89100
return ExitCode::FAILURE;
90101
}
91102
}
@@ -117,11 +128,17 @@ fn main() -> ExitCode {
117128

118129
Err(err) => {
119130
if err.kind() != io::ErrorKind::NotFound {
120-
error!("Could not load the state file: {err}");
131+
error!(
132+
"State file '{}' could not be read: {err}",
133+
config.daemon.state_file.value()
134+
);
121135
return ExitCode::FAILURE;
122136
}
123137

124-
info!("State file not found; starting from scratch");
138+
info!(
139+
"State file '{}' did not exist; starting from scratch",
140+
config.daemon.state_file.value()
141+
);
125142

126143
// Create required subdirectories (and their parents) if they don't
127144
// exist. This is only needed for directories to which we write files

0 commit comments

Comments
 (0)