From 95d8e7a75ca26f3ef90696fa7f7c00e3f468cdbf Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 20 Jan 2023 14:55:28 +0100 Subject: [PATCH] All filters are optional --- lib/mrsk/cli/app.rb | 2 +- lib/mrsk/commands/app.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/mrsk/cli/app.rb b/lib/mrsk/cli/app.rb index 96b41dc6..e9b9fdb7 100644 --- a/lib/mrsk/cli/app.rb +++ b/lib/mrsk/cli/app.rb @@ -84,7 +84,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base end desc "logs", "Show last 100 log lines from app on servers" - option :since, aliases: "-s", default: "5m", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)" + 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" option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)" def logs diff --git a/lib/mrsk/commands/app.rb b/lib/mrsk/commands/app.rb index e23a65b8..dd3aead6 100644 --- a/lib/mrsk/commands/app.rb +++ b/lib/mrsk/commands/app.rb @@ -31,11 +31,11 @@ class Mrsk::Commands::App < Mrsk::Commands::Base docker :ps, *service_filter end - def logs(since: "5m", lines: nil, grep: nil) + def logs(since: nil, lines: nil, grep: nil) pipe \ current_container_id, - "xargs docker logs --since #{since} -n #{lines} -t 2>&1", - ("grep #{grep}" if grep) + "xargs docker logs #{"--since #{since}" if since}#{" -n #{lines}" if lines} -t 2>&1", + ("grep '#{grep}'" if grep) end def exec(*command, interactive: false)