Skip to content

Commit 3248caa

Browse files
authored
fix(console): make retain_for default to 6s if not specfied (#383)
Fixes #382
1 parent 40f7971 commit 3248caa

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

tokio-console/src/config.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ pub enum OptionalCmd {
121121
#[derive(Debug, Clone, Copy, Deserialize)]
122122
struct RetainFor(Option<Duration>);
123123

124+
impl Default for RetainFor {
125+
fn default() -> Self {
126+
Self(Some(Duration::from_secs(6)))
127+
}
128+
}
129+
124130
impl fmt::Display for RetainFor {
125131
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
126132
match self.0 {
@@ -320,7 +326,7 @@ impl Config {
320326
}
321327

322328
pub(crate) fn retain_for(&self) -> Option<Duration> {
323-
self.retain_for.as_ref().and_then(|value| value.0)
329+
self.retain_for.unwrap_or_default().0
324330
}
325331

326332
pub(crate) fn target_addr(&self) -> Uri {
@@ -390,7 +396,7 @@ impl Default for Config {
390396
target_addr: Some(default_target_addr()),
391397
env_filter: Some(tracing_subscriber::EnvFilter::new("off")),
392398
log_directory: Some(default_log_directory()),
393-
retain_for: Some(RetainFor(Some(Duration::from_secs(6)))),
399+
retain_for: Some(RetainFor::default()),
394400
view_options: ViewOptions::default(),
395401
subcmd: None,
396402
}

0 commit comments

Comments
 (0)