From 8aeaee942fae5b846c074d5ddc264955a01d5ad5 Mon Sep 17 00:00:00 2001
From: Andreas Fuchs <asf@stripe.com>
Date: Mon, 26 May 2014 15:54:50 -0700
Subject: [PATCH] Adjust reload{,ing}_for_preload_upgrade names for the new
 reality

It's just reload_for_upgrade now that we always reload einhorn on
upgrades (:
---
 lib/einhorn.rb         |  6 +++---
 lib/einhorn/command.rb | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/einhorn.rb b/lib/einhorn.rb
index bb279ab..0e67b86 100644
--- a/lib/einhorn.rb
+++ b/lib/einhorn.rb
@@ -57,7 +57,7 @@ def self.default_state
         :respawn => true,
         :upgrading => false,
         :smooth_upgrade => false,
-        :reloading_for_preload_upgrade => false,
+        :reloading_for_upgrade => false,
         :path => nil,
         :cmd_name => nil,
         :verbosity => 1,
@@ -382,9 +382,9 @@ def self.run
     preload
 
     # In the middle of upgrading
-    if Einhorn::State.reloading_for_preload_upgrade
+    if Einhorn::State.reloading_for_upgrade
       Einhorn::Command.upgrade_workers
-      Einhorn::State.reloading_for_preload_upgrade = false
+      Einhorn::State.reloading_for_upgrade = false
     end
 
     while Einhorn::State.respawn || Einhorn::State.children.size > 0
diff --git a/lib/einhorn/command.rb b/lib/einhorn/command.rb
index cf5597f..2cb9781 100644
--- a/lib/einhorn/command.rb
+++ b/lib/einhorn/command.rb
@@ -235,7 +235,7 @@ def self.reload
       Process.wait(upgrade_sentinel)
       unless $?.exitstatus.zero?
         Einhorn.log_error("Can not initiate reload since sentinel process exited with #{$?.exitstatus}", :reload)
-        Einhorn::State.reloading_for_preload_upgrade = false
+        Einhorn::State.reloading_for_upgrade = false
         read.close
         return
       end
@@ -247,7 +247,7 @@ def self.reload
         Einhorn::Compat.exec(*respawn_commandline)
       rescue SystemCallError => e
         Einhorn.log_error("Could not reload! Attempting to continue. Error was: #{e}", :reload)
-        Einhorn::State.reloading_for_preload_upgrade = false
+        Einhorn::State.reloading_for_upgrade = false
         read.close
       end
     end
@@ -385,7 +385,7 @@ def self.full_upgrade(options={})
       options = {:smooth => false}.merge(options)
 
       Einhorn::State.smooth_upgrade = options.fetch(:smooth)
-      reload_for_preload_upgrade
+      reload_for_upgrade
     end
 
     def self.full_upgrade_smooth
@@ -395,8 +395,8 @@ def self.full_upgrade_fleet
       full_upgrade(:smooth => false)
     end
 
-    def self.reload_for_preload_upgrade
-      Einhorn::State.reloading_for_preload_upgrade = true
+    def self.reload_for_upgrade
+      Einhorn::State.reloading_for_upgrade = true
       reload
     end