From 9551837c174564b43dfc656bd0e9bc3f6d92a497 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 20 Jan 2023 14:48:53 +0100
Subject: [PATCH] Allow since as an option

And properly output/grep logs
---
 lib/mrsk/cli/app.rb      | 8 ++++++--
 lib/mrsk/commands/app.rb | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/mrsk/cli/app.rb b/lib/mrsk/cli/app.rb
index 55250399..96b41dc6 100644
--- a/lib/mrsk/cli/app.rb
+++ b/lib/mrsk/cli/app.rb
@@ -84,15 +84,19 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
   end
   
   desc "logs", "Show last 100 log lines from app on servers"
-  option :lines, type: :numeric, aliases: "-n", default: 1000, desc: "Number of log lines to pull from each server"
+  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 :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
     # FIXME: Catch when app containers aren't running
+
+    since = options[:since]
     lines = options[:lines]
     grep  = options[:grep]
+
     on(MRSK.config.hosts) do |host|
       begin
-        puts "App Host: #{host}\n" + capture(*MRSK.app.logs(lines: lines, grep: grep), verbosity: Logger::INFO) + "\n\n"
+        puts "App Host: #{host}\n" + capture(*MRSK.app.logs(since: since, lines: lines, grep: grep), verbosity: Logger::INFO) + "\n\n"
       rescue SSHKit::Command::Failed
         puts "App Host: #{host}\nNothing found\n\n"
       end
diff --git a/lib/mrsk/commands/app.rb b/lib/mrsk/commands/app.rb
index 18b93ee8..e23a65b8 100644
--- a/lib/mrsk/commands/app.rb
+++ b/lib/mrsk/commands/app.rb
@@ -31,10 +31,10 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
     docker :ps, *service_filter
   end
 
-  def logs(lines: 1000, grep: nil)
+  def logs(since: "5m", lines: nil, grep: nil)
     pipe \
       current_container_id,
-      "xargs docker logs -n #{lines} -t",
+      "xargs docker logs --since #{since} -n #{lines} -t 2>&1",
       ("grep #{grep}" if grep)
   end