From 652e17f260ae005a7930293f9deac455aeba78fb Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 21 Jan 2023 12:39:47 +0100 Subject: [PATCH] Configure Traefik logs and catch all --- lib/mrsk/cli/traefik.rb | 9 +++++++-- lib/mrsk/commands/traefik.rb | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/mrsk/cli/traefik.rb b/lib/mrsk/cli/traefik.rb index 6d85bf3c..79d7eef2 100644 --- a/lib/mrsk/cli/traefik.rb +++ b/lib/mrsk/cli/traefik.rb @@ -27,9 +27,14 @@ class Mrsk::Cli::Traefik < Mrsk::Cli::Base on(MRSK.traefik_hosts) { |host| puts_by_host host, capture_with_info(*MRSK.traefik.info), type: "Traefik" } end - desc "logs", "Show last 100 log lines from Traefik on servers" + desc "logs", "Show log lines from Traefik on servers" + option :since, aliases: "-s", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)" + option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server" def logs - on(MRSK.traefik_hosts) { |host| puts_by_host host, capture(*MRSK.traefik.logs), type: "Traefik" } + since = options[:since] + lines = options[:lines] + + on(MRSK.traefik_hosts) { |host| puts_by_host host, capture(*MRSK.traefik.logs(since: since, lines: lines)), type: "Traefik" } end desc "remove", "Remove Traefik container and image from servers" diff --git a/lib/mrsk/commands/traefik.rb b/lib/mrsk/commands/traefik.rb index 6e7461bc..006d4bbc 100644 --- a/lib/mrsk/commands/traefik.rb +++ b/lib/mrsk/commands/traefik.rb @@ -23,8 +23,12 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base docker :ps, "--filter", "name=traefik" end - def logs - docker :logs, "traefik", "-n", "100", "-t" + def logs(since: nil, lines: nil) + docker :logs, "traefik", + (" --since #{since}" if since), + (" -n #{lines}" if lines), + "-t", + "2>&1" end def remove_container