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

Merge pull request #846 from basecamp/always-log-boot-errors

Browse Source 
Log on boot errors with one role
This commit is contained in:
Donal McBreen
2024-06-20 08:50:03 +01:00
committed by GitHub
parent f6a9698f55 f8f88af534
commit dde637ffff
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -72,7 +72,7 @@ class Kamal::Cli::App::Boot
def release_barrier def release_barrier
if barrier.open if barrier.open
info "First #{KAMAL.primary_role} container is healthy on #{host}, booting other roles" info "First #{KAMAL.primary_role} container is healthy on #{host}, booting any other roles"
end end
end end
@@ -87,7 +87,7 @@ class Kamal::Cli::App::Boot
def close_barrier def close_barrier
if barrier.close if barrier.close
info "First #{KAMAL.primary_role} container is unhealthy on #{host}, not booting other roles" info "First #{KAMAL.primary_role} container is unhealthy on #{host}, not booting any other roles"
error capture_with_info(*app.logs(version: version)) error capture_with_info(*app.logs(version: version))
error capture_with_info(*app.container_health_log(version: version)) error capture_with_info(*app.container_health_log(version: version))
end end

2
test/integration/broken_deploy_test.rb
View File

@@ -26,7 +26,7 @@ class BrokenDeployTest < IntegrationTest
private private
def assert_failed_deploy(output) def assert_failed_deploy(output)
assert_match "Waiting for the first healthy web container before booting workers on vm3...", output assert_match "Waiting for the first healthy web container before booting workers on vm3...", output
assert_match /First web container is unhealthy on vm[12], not booting other roles/, output assert_match /First web container is unhealthy on vm[12], not booting any other roles/, output
assert_match "First web container is unhealthy, not booting workers on vm3", output assert_match "First web container is unhealthy, not booting workers on vm3", output
assert_match "nginx: [emerg] unexpected end of file, expecting \";\" or \"}\" in /etc/nginx/conf.d/default.conf:2", output assert_match "nginx: [emerg] unexpected end of file, expecting \";\" or \"}\" in /etc/nginx/conf.d/default.conf:2", output
assert_match 'ERROR {"Status":"unhealthy","FailingStreak":0,"Log":[]}', output assert_match 'ERROR {"Status":"unhealthy","FailingStreak":0,"Log":[]}', output