diff --git a/lib/kamal/commands/proxy.rb b/lib/kamal/commands/proxy.rb index 9b145d2d..5ac1c94e 100644 --- a/lib/kamal/commands/proxy.rb +++ b/lib/kamal/commands/proxy.rb @@ -37,7 +37,7 @@ class Kamal::Commands::Proxy < Kamal::Commands::Base def logs(timestamps: true, since: nil, lines: nil, grep: nil, grep_options: nil) pipe \ - docker(:logs, container_name, (" --since #{since}" if since), (" --tail #{lines}" if lines), ("--timestamps" if timestamps), "2>&1"), + docker(:logs, container_name, ("--since #{since}" if since), ("--tail #{lines}" if lines), ("--timestamps" if timestamps), "2>&1"), ("grep '#{grep}'#{" #{grep_options}" if grep_options}" if grep) end diff --git a/test/commands/proxy_test.rb b/test/commands/proxy_test.rb index 4f6275a2..e8a3f252 100644 --- a/test/commands/proxy_test.rb +++ b/test/commands/proxy_test.rb @@ -67,19 +67,19 @@ class CommandsProxyTest < ActiveSupport::TestCase test "proxy logs since 2h" do assert_equal \ - "docker logs kamal-proxy --since 2h --timestamps 2>&1", + "docker logs kamal-proxy --since 2h --timestamps 2>&1", new_command.logs(since: "2h").join(" ") end test "proxy logs last 10 lines" do assert_equal \ - "docker logs kamal-proxy --tail 10 --timestamps 2>&1", + "docker logs kamal-proxy --tail 10 --timestamps 2>&1", new_command.logs(lines: 10).join(" ") end test "proxy logs without timestamps" do assert_equal \ - "docker logs kamal-proxy 2>&1", + "docker logs kamal-proxy 2>&1", new_command.logs(timestamps: false).join(" ") end