burninator 0.6.0 → 0.6.1

data/README.md

@@ -28,6 +28,7 @@ traffic, its caches should keep warm and ready for failover.
 ## Requirements
 
 * Rails application (only tested against 3.2.12)
+* Ruby 1.9+
 * Redis
 
 ## Installation
@@ -50,7 +51,7 @@ gem "burninator"
 
 ```ruby
 burninator = Burninator.new($redis)
-burninator.broadcast(:percentage => 25)
+burninator.broadcast(percentage: 25)
 ```
 
 If you leave off the `redis` parameter, it will create a new connection
@@ -58,7 +59,7 @@ using what's configured in the environment as `REDIS_URL`.
 
 `percentage` will default to 5%.
 
-If either WARM_TARGET_URL is missing or REDIS_URL is missing and a `redis`
+If either `WARM_TARGET_URL` is missing or `REDIS_URL` is missing and a `redis`
 parameter is not provided, a `Burninator::EnvironmentError` will be raised.
 
 #### Add the process in your Procfile:

data/lib/burninator.rb

@@ -13,18 +13,13 @@ class Burninator
   end
 
   def warm
-    trap_signals
-
     Burninator::Warmer.new(redis, channel, database).run
   end
 
   def broadcast(options = {})
-    percentage = options.fetch(:percentage, DEFAULT_PERCENTAGE)
-    ignore = options[:ignore]
-
     broadcaster = Burninator::Broadcaster.new(redis, channel,
-      :ignore => ignore,
-      :percentage => percentage
+      percentage: options.fetch(:percentage, DEFAULT_PERCENTAGE),
+      ignore: options[:ignore]
     )
 
     broadcaster.run
@@ -36,13 +31,8 @@ class Burninator
 
   private
 
-  def trap_signals
-    trap(:INT) { abort }
-    trap(:TERM) { abort }
-  end
-
   def redis
-    @redis ||= Redis.new(:url => redis_url)
+    @redis ||= Redis.new(url: redis_url)
   end
 
   def database

data/lib/burninator/warmer.rb

@@ -7,16 +7,28 @@ class Burninator
     end
 
     def run
-      @redis.subscribe(@channel) do |on|
-        on.message do |_, serialized|
-          event = Marshal.load(serialized)
-          process(event)
+      trap_signals
+
+      begin
+        @redis.subscribe(@channel) do |on|
+          on.message do |_, serialized|
+            event = Marshal.load(serialized)
+            process(event)
+          end
         end
+      rescue Errno::ECONNRESET
+        Rails.logger.error("Redis connection reset; resubscribing...")
+        retry
       end
     end
 
     private
 
+    def trap_signals
+      trap(:INT) { abort }
+      trap(:TERM) { abort }
+    end
+
     def process(event)
       query = event[:sql].squish
       binds = event[:binds]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: burninator
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors: