From 1f06b1ff94b882014a678da1d55655571dff19a0 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 12 Jan 2023 16:00:21 +0100 Subject: [PATCH] Switch to just last 100 log lines for now --- lib/mrsk/commands/app.rb | 2 +- lib/mrsk/commands/traefik.rb | 2 +- lib/tasks/mrsk/app.rake | 4 ++-- lib/tasks/mrsk/traefik.rake | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/mrsk/commands/app.rb b/lib/mrsk/commands/app.rb index 082930b8..81803f3b 100644 --- a/lib/mrsk/commands/app.rb +++ b/lib/mrsk/commands/app.rb @@ -36,7 +36,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base end def logs - [ "docker ps -q #{service_filter.join(" ")} | xargs docker logs -f" ] + [ "docker ps -q #{service_filter.join(" ")} | xargs docker logs -n 100 -t" ] end def exec(*command, interactive: false) diff --git a/lib/mrsk/commands/traefik.rb b/lib/mrsk/commands/traefik.rb index c2bdef4e..6e7461bc 100644 --- a/lib/mrsk/commands/traefik.rb +++ b/lib/mrsk/commands/traefik.rb @@ -24,7 +24,7 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base end def logs - docker :logs, "traefik" + docker :logs, "traefik", "-n", "100", "-t" end def remove_container diff --git a/lib/tasks/mrsk/app.rake b/lib/tasks/mrsk/app.rake index a8422d34..bb50a313 100644 --- a/lib/tasks/mrsk/app.rake +++ b/lib/tasks/mrsk/app.rake @@ -95,9 +95,9 @@ namespace :mrsk do on(MRSK.config.hosts) { |host| puts "App Host: #{host}\n" + capture(*MRSK.app.list_containers) + "\n\n" } end - desc "Tail logs from app containers" + desc "Show last 100 log lines from app on servers" task :logs do - on(MRSK.config.hosts) { execute *MRSK.app.logs } + on(MRSK.config.hosts) { |host| puts "App Host: #{host}\n" + capture(*MRSK.app.logs) + "\n\n" } end desc "Remove app containers and images from servers" diff --git a/lib/tasks/mrsk/traefik.rake b/lib/tasks/mrsk/traefik.rake index cd136928..3716283b 100644 --- a/lib/tasks/mrsk/traefik.rake +++ b/lib/tasks/mrsk/traefik.rake @@ -25,6 +25,11 @@ namespace :mrsk do on(MRSK.config.role(:web).hosts) { |host| puts "Traefik Host: #{host}\n" + capture(*MRSK.traefik.info) + "\n\n" } end + desc "Show last 100 log lines from Traefik on servers" + task :logs do + on(MRSK.config.hosts) { |host| puts "Traefik Host: #{host}\n" + capture(*MRSK.traefik.logs) + "\n\n" } + end + desc "Remove Traefik container and image from servers" task remove: %i[ stop ] do on(MRSK.config.role(:web).hosts) do