spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only use barrier when needed, more descriptive info

Browse Source
This commit is contained in:
Donal McBreen
2024-05-20 12:17:01 +01:00
parent bb2ca81d87
commit ee758d951a
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/kamal/cli/app.rb
View File

@@ -15,7 +15,7 @@ class Kamal::Cli::App < Kamal::Cli::Base
end
#  Primary hosts and roles are returned first, so they can open the barrier
barrier = Kamal::Cli::Healthcheck::Barrier.new
barrier = Kamal::Cli::Healthcheck::Barrier.new if KAMAL.roles.many?
on(KAMAL.hosts, **KAMAL.boot_strategy) do |host|
KAMAL.roles_on(host).each do |role|

12
lib/kamal/cli/app/boot.rb
View File

@@ -43,8 +43,8 @@ class Kamal::Cli::App::Boot
reach_barrier
rescue => e
if barrier_role? && barrier.close
info "Deploy failed, so closed barrier (#{host})"
if barrier_role? && barrier&.close
info "First #{KAMAL.primary_role} container unhealthy, stopping other roles (#{host})"
error capture_with_info(*app.logs(version: version))
error capture_with_info(*app.container_health_log(version: version))
end
@@ -71,7 +71,7 @@ class Kamal::Cli::App::Boot
if barrier
if barrier_role?
if barrier.open
info "Opened barrier (#{host})"
info "First #{KAMAL.primary_role} container healthy, continuing other roles (#{host})"
end
else
wait_for_barrier
@@ -80,11 +80,11 @@ class Kamal::Cli::App::Boot
end
def wait_for_barrier
info "Waiting at web barrier (#{host})..."
info "Waiting for a healthy #{KAMAL.primary_role} container (#{host})..."
barrier.wait
info "Barrier opened (#{host})"
info "First #{KAMAL.primary_role} container is healthy, continuing (#{host})"
rescue Kamal::Cli::Healthcheck::Error
info "Barrier closed, shutting down new container (#{host})..."
info "First #{KAMAL.primary_role} container is unhealthy, stopping (#{host})"
raise
end