Skip to content

fix(logs): use singular wording when clearing one old log file #295

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

Open
694410194 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(logs): use singular wording when clearing one old log file #295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion src/cortex-cli/src/logs_cmd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ fn format_size(bytes: u64) -> String {
}
}

fn log_file_label(count: usize) -> &'static str {
if count == 1 { "log file" } else { "log files" }
}

impl LogsCli {
/// Run the logs command.
pub async fn run(self) -> Result<()> {
Expand Down Expand Up @@ -344,8 +348,9 @@ impl LogsCli {

if cleared > 0 {
println!(
"Cleared {} log file(s) ({}) older than {} days.",
"Cleared {} {} ({}) older than {} days.",
cleared,
log_file_label(cleared),
format_size(cleared_bytes),
self.keep_days
);
Expand Down Expand Up @@ -406,6 +411,13 @@ mod tests {
assert_eq!(format_size(MB), "1.00 MB");
}

#[test]
fn test_log_file_label() {
assert_eq!(log_file_label(0), "log files");
assert_eq!(log_file_label(1), "log file");
assert_eq!(log_file_label(2), "log files");
}

// =========================================================================
// Tests for LogsCli default values
// =========================================================================
Expand Down