Skip to content

Commit 993f724

Browse files
iotedge check: Only verify logging options for json-file driver (which is the default).
This fixes #6754 NOTE: All other logging driver usually do logrotation on their own
1 parent ed1b6eb commit 993f724

1 file changed

Lines changed: 12 additions & 13 deletions

File tree

edgelet/iotedge/src/check/checks/container_engine_logrotate.rs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,20 @@ impl ContainerEngineLogrotate {
5656
self.daemon_config = Some(daemon_config.clone());
5757

5858
match daemon_config.log_driver.as_deref() {
59-
Some("journald") => return Ok(CheckResult::Ok),
60-
None => return Ok(CheckResult::Warning(anyhow!(MESSAGE))),
61-
_ => (),
62-
}
59+
None | Some("json-file") => {
60+
if let Some(log_opts) = &daemon_config.log_opts {
61+
if log_opts.max_file.is_none() {
62+
return Ok(CheckResult::Warning(anyhow!(MESSAGE)));
63+
}
6364

64-
if let Some(log_opts) = &daemon_config.log_opts {
65-
if log_opts.max_file.is_none() {
66-
return Ok(CheckResult::Warning(anyhow!(MESSAGE)));
65+
if log_opts.max_size.is_none() {
66+
return Ok(CheckResult::Warning(anyhow!(MESSAGE)));
67+
}
68+
} else {
69+
return Ok(CheckResult::Warning(anyhow!(MESSAGE)));
70+
}
6771
}
68-
69-
if log_opts.max_size.is_none() {
70-
return Ok(CheckResult::Warning(anyhow!(MESSAGE)));
71-
}
72-
} else {
73-
return Ok(CheckResult::Warning(anyhow!(MESSAGE)));
72+
_ => (),
7473
}
7574

7675
Ok(CheckResult::Ok)

0 commit comments

Comments
 (0)