superbolt 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 968ca2d1026ac1b168a119f49a57c5f5c5bbf107
-  data.tar.gz: b8c817960cf0a1d73ace5eb4068eb35af4fb18b5
+  metadata.gz: b431fab064f963b74d22ee65e00ff416d9272241
+  data.tar.gz: b06b856a6793911ba2f2d225e681401951084493
 SHA512:
-  metadata.gz: ebad807328b0aaa33ca84477e517fc9c4655709a942d3143ac2563c38b4d6fe83729394b6365b1d8174c0a1cd1a4ca67b8757f8ef1aab7c9f8ce74f8f0dc9934
-  data.tar.gz: b37936716e7266e02c914a76c9eeb3a4da53059cacd62ea7b8d635a1098620c09a4e984abe0964b88623c6566d393e2b2fbb20ae02de8ec08713462798d7a8ce
+  metadata.gz: 37f36e6ac9a18ab4318d2b57f91ff11576e61b32e56cfa13925fa89e786d7dd01ddb2ca470ed534acaaf7b43ad8b2d9443a9a891d46b1e9ab4f0665a338dfcee
+  data.tar.gz: 18f8123f5ce8aba012e1af2bc1ba64dd7f2ccd8ecc6b67f96b7bf54511a0729f294bbb6f8d376081a8b978bddf0e42da0acab27396abd82b1d7780bce682452a

data/lib/superbolt.rb

@@ -25,6 +25,7 @@ require "superbolt/runner/ack_one"
 require "superbolt/runner/ack"
 require "superbolt/runner/pop"
 require "superbolt/runner/greedy"
+require "superbolt/runner/active_record_deferrable"
 
 require "superbolt/queue"
 require "superbolt/incoming_message"

data/lib/superbolt/app.rb

@@ -1,13 +1,12 @@
 module Superbolt
   class App
-    attr_reader :config, :env, :runner_type
+    attr_reader :config, :env
     attr_accessor :logger
 
     def initialize(name, options={})
       @name = name
       @env =            options[:env] || Superbolt.env
       @logger =         options[:logger] || Logger.new($stdout)
-      @runner_type =    options[:runner] || :default
       @config =         options[:config] || Superbolt.config
     end
 
@@ -44,7 +43,7 @@ module Superbolt
       EventMachine.run do
         queue.channel.auto_recovery = true
 
-        # LShift came up with this solution, which helps reconnect when 
+        # LShift came up with this solution, which helps reconnect when
         # a process runs longer than the heartbeat (and therefore disconnects)
         queue.channel.connection.on_tcp_connection_loss do |conn, settings|
           puts 'Lost TCP connection, reconnecting'
@@ -60,7 +59,7 @@ module Superbolt
     end
 
     def runner_class
-      runner_map[runner_type] || default_runner
+      runner_map[config.runner_type] || default_runner
     end
 
     def runner_map
@@ -68,7 +67,8 @@ module Superbolt
         pop:      Runner::Pop,
         ack_one:  Runner::AckOne,
         ack:      Runner::Ack,
-        greedy:   Runner::Greedy
+        greedy:   Runner::Greedy,
+        ar_deferrable: Runner::ActiveRecordDeferrable
       }
     end
 

data/lib/superbolt/config.rb

@@ -23,6 +23,10 @@ module Superbolt
       options[:connection_key] || 'RABBITMQ_URL'
     end
 
+    def runner_type
+      options[:runner_type_key] ? ENV[options[:runner_type_key]].to_sym : :default
+    end
+
     def env_params
       ENV[env_connection_key]
     end

data/lib/superbolt/runner/active_record_deferrable.rb

@@ -0,0 +1,13 @@
+module Superbolt
+  module Runner
+    class ActiveRecordDeferrable < AckOne
+      def before_fork
+        ActiveRecord::Base.connection.disconnect!
+      end
+
+      def after_fork
+        ActiveRecord::Base.establish_connection
+      end
+    end
+  end
+end

data/lib/superbolt/runner/default.rb

@@ -14,7 +14,11 @@ module Superbolt
         queue.subscribe(ack: ack) do |metadata, payload|
           #Thanks again to LShift for this solution to long-running processes
           #Defer keeps heartbeat running while the process finishes
+
+          before_fork
           EM.defer do
+            after_fork
+
             # this gets run on the thread pool
             message = Superbolt::IncomingMessage.new(metadata, payload, channel)
             processor = Superbolt::Processor.new(message, logger, &block)
@@ -35,6 +39,14 @@ module Superbolt
 
       def prefetch
       end
+
+      def before_fork
+        # Implement me in da subclass
+      end
+
+      def after_fork
+        # Implement me in da subclass
+      end
     end
   end
 end

data/lib/superbolt/version.rb

@@ -1,3 +1,3 @@
 module Superbolt
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/tasks/superbolt.rake

@@ -1,7 +1,7 @@
 # assumes an environment task that sets up your app environment
 desc "worker that reads the queue and sends messages through the router as configured"
 task :superbolt => :environment do
-  Superbolt::App.new(Superbolt.app_name).run do |message, logger|
+  Superbolt::App.new(Superbolt.app_name, {}).run do |message, logger|
     Superbolt::Router.new(message, logger).perform
   end
 end

data/spec/app_spec.rb

@@ -104,6 +104,12 @@ describe Superbolt::App do
     it_should_behave_like "app"
   end
 
+  context 'when runner acknowledges one and uses activerecord deferrable' do
+    let(:runner_type) { :ar_deferrable }
+
+    it_should_behave_like "app"
+  end
+
   context 'when runner acknowledges without a prefetch limit' do
     let(:runner_type) { :ack }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbolt
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - socialchorus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -156,6 +156,7 @@ files:
 - lib/superbolt/router.rb
 - lib/superbolt/runner/ack.rb
 - lib/superbolt/runner/ack_one.rb
+- lib/superbolt/runner/active_record_deferrable.rb
 - lib/superbolt/runner/base.rb
 - lib/superbolt/runner/default.rb
 - lib/superbolt/runner/greedy.rb
@@ -199,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Superbolt is a gem that makes SOA intra-app communication easy, via RabbitMQ