ey_stonith 0.1.3 → 0.1.4

data/lib/ey_stonith/box.rb

@@ -30,12 +30,16 @@ module EY
       def try_takeover(master_unchanged)
         @master.with_locked_data do |data|
           if master_unchanged.call(data.key)
-            Stonith.logger.info("Locked! Taking over.")
-            @slave = nil
-            @history << :takeover
-            @local_master = LocalMaster.new(@config.notify_uri, @config.cloud_credentials)
-            new_data = @local_master.takeover!(data.instance_id, data.ip)
-            @master.update new_data
+            begin
+              Stonith.logger.info("Locked! Taking over.")
+              @slave = nil
+              @history << :takeover
+              @local_master = LocalMaster.new(@config.notify_uri, @config.cloud_credentials)
+              new_data = @local_master.takeover!(data.instance_id, data.ip)
+              @master.update new_data
+            ensure
+              @history << :done
+            end
           else
             Stonith.logger.info("Failed to grab lock, relenting.")
             @slave.start!

data/lib/ey_stonith/config.rb

@@ -13,7 +13,7 @@ module EY
 
       def monitor_heartbeat() 10 end
       def redis_key() 'ey:stonith' end
-      def redis_db() 15 end
+      def redis_db() 14 end
       def redis_host() redis[:host] end # support sometimes changes this, do not cache!
       def redis_port() redis[:port] end
       def master_hostname_from_dna() dna['master_app_server']['private_dns_name'] end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz