From 52d75508ead8219b5cb5772dffcb2cfd0812493d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 30 Jan 2023 12:49:50 +0100 Subject: [PATCH] Ensure there's some cap on output Need to DRY this out --- lib/mrsk/cli/accessory.rb | 2 +- lib/mrsk/cli/app.rb | 2 +- lib/mrsk/cli/traefik.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/mrsk/cli/accessory.rb b/lib/mrsk/cli/accessory.rb index 0bd847b1..144dc9c7 100644 --- a/lib/mrsk/cli/accessory.rb +++ b/lib/mrsk/cli/accessory.rb @@ -118,7 +118,7 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base end else since = options[:since] - lines = options[:lines] + lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set on(accessory.host) do puts capture_with_info(*accessory.logs(since: since, lines: lines, grep: grep)) diff --git a/lib/mrsk/cli/app.rb b/lib/mrsk/cli/app.rb index 150ec1ff..f5832da9 100644 --- a/lib/mrsk/cli/app.rb +++ b/lib/mrsk/cli/app.rb @@ -109,7 +109,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base end else since = options[:since] - lines = options[:lines] + lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set on(MRSK.hosts) do |host| begin diff --git a/lib/mrsk/cli/traefik.rb b/lib/mrsk/cli/traefik.rb index e60d548f..ca62bbd3 100644 --- a/lib/mrsk/cli/traefik.rb +++ b/lib/mrsk/cli/traefik.rb @@ -50,7 +50,7 @@ class Mrsk::Cli::Traefik < Mrsk::Cli::Base end else since = options[:since] - lines = options[:lines] + lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set on(MRSK.traefik_hosts) do |host| puts_by_host host, capture(*MRSK.traefik.logs(since: since, lines: lines, grep: grep)), type: "Traefik"