From 701f6ff23725602532d8631d40262fe457834a2d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 26 Feb 2023 11:19:30 +0100 Subject: [PATCH] Move sleep note out of host loop, so we only see it once --- lib/mrsk/cli/app.rb | 5 +---- lib/mrsk/cli/main.rb | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/mrsk/cli/app.rb b/lib/mrsk/cli/app.rb index fed1883f..25bb8bdf 100644 --- a/lib/mrsk/cli/app.rb +++ b/lib/mrsk/cli/app.rb @@ -3,7 +3,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base def boot say "Get most recent version available as an image...", :magenta unless options[:version] using_version(options[:version] || most_recent_version_available) do |version| - say "Start container with version #{version} (or reboot if already running)...", :magenta + say "Start container with version #{version} using a #{MRSK.config.readiness_delay}s readiness delay (or reboot if already running)...", :magenta cli = self @@ -14,10 +14,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base begin old_version = capture_with_info(*MRSK.app.current_running_version).strip execute *MRSK.app.run(role: role.name) - - cli.say "Waiting #{MRSK.config.readiness_delay}s for app to boot...", :magenta sleep MRSK.config.readiness_delay - execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false if old_version.present? rescue SSHKit::Command::Failed => e diff --git a/lib/mrsk/cli/main.rb b/lib/mrsk/cli/main.rb index d77798f6..db80d9f6 100644 --- a/lib/mrsk/cli/main.rb +++ b/lib/mrsk/cli/main.rb @@ -55,7 +55,7 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base MRSK.version = version if container_name_available?(MRSK.config.service_with_version) - say "Start version #{version}, then stop the old version...", :magenta + say "Start version #{version}, then wait #{MRSK.config.readiness_delay}s for app to boot before stopping the old version...", :magenta cli = self @@ -64,7 +64,6 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base execute *MRSK.app.start - cli.say "Waiting #{MRSK.config.readiness_delay}s for app to start...", :magenta sleep MRSK.config.readiness_delay execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false