Swap grep context with grep options

This commit is contained in:
Nick Hammond
2024-06-06 09:26:12 -07:00
parent eb79d93139
commit c7bd377fa5
12 changed files with 43 additions and 43 deletions

View File

@@ -1,17 +1,17 @@
module Kamal::Commands::App::Logging
def logs(version: nil, since: nil, lines: nil, grep: nil, context: nil)
def logs(version: nil, since: nil, lines: nil, grep: nil, grep_options: nil)
pipe \
version ? container_id_for_version(version) : current_running_container_id,
"xargs docker logs#{" --since #{since}" if since}#{" --tail #{lines}" if lines} 2>&1",
("grep '#{grep}'#{" -C #{context}" if context}" if grep)
("grep '#{grep}'#{" #{grep_options}" if grep_options}" if grep)
end
def follow_logs(host:, lines: nil, grep: nil, context: nil)
def follow_logs(host:, lines: nil, grep: nil, grep_options: nil)
run_over_ssh \
pipe(
current_running_container_id,
"xargs docker logs --timestamps#{" --tail #{lines}" if lines} --follow 2>&1",
(%(grep "#{grep}"#{" -C #{context}" if context}) if grep)
(%(grep "#{grep}"#{" #{grep_options}" if grep_options}) if grep)
),
host: host
end