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

Extract readiness_delay to config

Browse Source
This commit is contained in:
David Heinemeier Hansson
2023-02-23 12:02:49 +01:00
parent b244e919bf
commit e12436a1db
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
begin begin
old_version = capture_with_info(*MRSK.app.current_running_version).strip old_version = capture_with_info(*MRSK.app.current_running_version).strip
execute *MRSK.app.run(role: role.name) execute *MRSK.app.run(role: role.name)
sleep 10 sleep MRSK.config.readiness_delay
execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false if old_version.present? execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false if old_version.present?
rescue SSHKit::Command::Failed => e rescue SSHKit::Command::Failed => e

2
lib/mrsk/cli/main.rb
View File

@@ -61,7 +61,7 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
old_version = capture_with_info(*MRSK.app.current_running_version).strip.presence old_version = capture_with_info(*MRSK.app.current_running_version).strip.presence
execute *MRSK.app.start execute *MRSK.app.start
sleep 10 sleep MRSK.config.readiness_delay
execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false
end end

3
lib/mrsk/configuration.rb
View File

@@ -136,6 +136,9 @@ class Mrsk::Configuration
{ "path" => "/up", "port" => 3000 }.merge(raw_config.healthcheck || {}) { "path" => "/up", "port" => 3000 }.merge(raw_config.healthcheck || {})
end end
def readiness_delay
raw_config.readiness_delay || 7
end
def valid? def valid?
ensure_required_keys_present && ensure_env_available ensure_required_keys_present && ensure_env_available