flapjack 0.6.31 → 0.6.32

data/bin/flapjack-populator

@@ -13,6 +13,7 @@ end
 require 'flapjack/configuration'
 require 'flapjack/data/contact'
 require 'flapjack/data/entity'
+require 'flapjack/data/event'
 
 options = OpenStruct.new
 options.config    = File.join('etc', 'flapjack_config.yaml')
@@ -92,7 +93,7 @@ when "import-entities"
 
 when "purge-events"
   @persistence = get_redis_connection(config_env['redis'])
-  Flapjack::Data.Event.purge_all(:redis => @persistence)
+  Flapjack::Data::Event.purge_all(:redis => @persistence)
   @persistence.quit
 
 else

data/dist/etc/init.d/flapper

@@ -21,7 +21,7 @@ fi
 
 # Evaluate command
 
-rbenv shell 1.9.3-p125 && flapper
+rbenv shell 1.9.3-p125 && flapper-control $1
 RETVAL=$?
 
 exit $RETVAL

data/lib/flapjack/configuration.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'yaml'
+require 'logger'
 
 module Flapjack
 
@@ -60,4 +61,4 @@ module Flapjack
 
   end
 
-end
+end

data/lib/flapjack/coordinator.rb

@@ -227,8 +227,12 @@ module Flapjack
     end
 
     def build_redis_connection_pool(options = {})
+      redis_em_options = @redis_options.dup
+      redis_db = redis_em_options.delete(:db)
       EventMachine::Synchrony::ConnectionPool.new(:size => options[:size] || 5) do
-        ::Redis.new(@redis_options.merge(:driver => (options[:driver] || 'synchrony')))
+        redis = EM::Protocols::Redis.connect(redis_em_options)
+        redis.select(redis_db)
+        redis
       end
     end
 

data/lib/flapjack/data/event.rb

@@ -23,7 +23,7 @@ module Flapjack
 
         # In production, we wait indefinitely for events coming from other systems.
         if block
-          raw   = opts[:persistence].blpop('events').last
+          raw   = opts[:persistence].blpop('events', 0).last
           event = ::JSON.parse(raw)
           self.new(event)
         else

data/lib/flapjack/executive.rb

@@ -25,8 +25,6 @@ module Flapjack
 
     def setup
       @redis = build_redis_connection_pool
-      redis_client_status = @redis.client
-      @logger.debug("Flapjack::Executive.initialize: @redis client status: " + redis_client_status.inspect)
 
       @queues = {:email     => @config['email_queue'],
                  :sms       => @config['sms_queue'],

data/lib/flapjack/jabber.rb

@@ -271,7 +271,7 @@ module Flapjack
         # before joining the group chat rooms)
         if connected?
           logger.debug("jabber is connected so commencing blpop on #{queue}")
-          events[queue] = @redis.blpop(queue)
+          events[queue] = @redis.blpop(queue, 0)
           event         = Yajl::Parser.parse(events[queue][1])
           type          = event['notification_type']
           logger.debug('jabber notification event received')

data/lib/flapjack/pagerduty.rb

@@ -186,7 +186,7 @@ module Flapjack
 
       until should_quit?
         logger.debug("pagerduty gateway is going into blpop mode on #{queue}")
-        events[queue] = @redis.blpop(queue)
+        events[queue] = @redis.blpop(queue, 0)
         event         = Yajl::Parser.parse(events[queue][1])
         type          = event['notification_type']
         logger.debug("pagerduty notification event popped off the queue: " + event.inspect)

data/lib/flapjack/pikelet.rb

@@ -27,9 +27,15 @@ module Flapjack
     def build_redis_connection_pool(options = {})
       return unless @bootstrapped
       if defined?(EventMachine) && defined?(EventMachine::Synchrony)
+
+        redis_em_options = @redis_config.dup
+        redis_db = redis_em_options.delete(:db)
         EventMachine::Synchrony::ConnectionPool.new(:size => options[:size] || 5) do
-          ::Redis.new(@redis_config.merge(:driver => 'synchrony'))
+          r = EM::Protocols::Redis.connect(redis_em_options)
+          r.select(redis_db)
+          r
         end
+
       else
         ::Redis.new(@redis_config)
       end

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.6.31"
+  VERSION = "0.6.32"
 end

data/spec/lib/flapjack/jabber_spec.rb

@@ -25,6 +25,7 @@ describe Flapjack::Jabber do
 
     fj = Flapjack::Jabber.new
     fj.bootstrap(:config => config)
+    fj.should_receive(:build_redis_connection_pool)
 
     EM.should_receive(:next_tick).exactly(4).times.and_yield
     EM.should_receive(:synchrony).exactly(4).times.and_yield
@@ -48,6 +49,8 @@ describe Flapjack::Jabber do
     fj = Flapjack::Jabber.new
     fj.bootstrap(:config => config)
 
+    fj.should_receive(:build_redis_connection_pool)
+
     fj.should_receive(:connected?).and_return(true)
     fj.should_receive(:write).with(an_instance_of(Blather::Stanza::Presence))
     fj.should_receive(:write).with(an_instance_of(Blather::Stanza::Message))
@@ -131,10 +134,10 @@ describe Flapjack::Jabber do
     EM::Synchrony.should_receive(:add_periodic_timer).with(60).and_return(timer_2)
 
     redis = mock('redis')
-    EventMachine::Synchrony::ConnectionPool.should_receive(:new).and_return(redis)
 
     fj = Flapjack::Jabber.new
     fj.bootstrap(:config => config)
+    fj.should_receive(:build_redis_connection_pool).and_return(redis)
     fj.should_receive(:register_handler).exactly(4).times
 
     fj.should_receive(:connect)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.31
+  version: 0.6.32
   prerelease: 
 platform: ruby
 authors: