msgr 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b95de3e709c9032c20b8b63b90b83cd07ce8581
-  data.tar.gz: e16b2af077347d2e2ffb864f610018ef5269b378
+  metadata.gz: 8948601f4dd6d56c3d502ec2c9898e7b0d6bd6d7
+  data.tar.gz: 4f4bf4567945427f5296f5d9e38f064ed54b8769
 SHA512:
-  metadata.gz: 5325d0a5774c9409507c7f9b19652ba91b83ccba80e1d710d87b2df1d49a83de3d456078ab360849dfbe9f5691ee661104124fcd55f197ae3092da4378350a83
-  data.tar.gz: 891458be94a172ed4c9a724ca90d905d861eb77e84823f8240c309bcd76027d43c60d87657b8a1f2d759e6d92e55f9bd032104f3a196e9d109464a7724ec1b50
+  metadata.gz: 70a9b7e8ed8a3e94dbb6fde5401954661911450f8ffadf7a19135d682f6088d81565151b5fcfe933bbb7b08392f35126c53aab957a1019ec9535d227fdfa06c9
+  data.tar.gz: d8761f0ec024977fce524b91127f7728a302734ad88dfcaa6a40cd77df1aaf2168ea187007df33d9e9ac436c392a09add8bb709beac203dfe77c54064109c949

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+## 0.3.0
+
+* Support for forking web servers like unicorn
+
+## 0.2.1
+
+* Fix wrong rails initializer code - was not use the config file
+
+## 0.2.0
+
+* Improve rails initializer code

data/README.md

@@ -84,6 +84,20 @@ class TestController < ApplicationController
 end
 ```
 
+## Msgr and fork web server like unicorn
+
+Per default msgr opens the rabbitmq connect when rails is loaded. If you use a multi-process web server that preloads the application (like unicorn) will lead to unexpected behavior. In this case adjust `config/rabbitmq.yml` and adjust `autostart = false`:
+
+
+```yaml
+common: &common
+  uri: amqp://localhost/
+  autostart: false
+```
+
+And call inside each worker `Msgr.client.start` - e.g. in an after-fork block
+
+
 ## Contributing
 
 1. Fork it

data/lib/msgr/client.rb

@@ -19,9 +19,7 @@ module Msgr
       @uri.path   = config[:vhost] ||= @uri.path.present? ? @uri.path : '/'
       config.reject! { |_,v| v.nil? }
 
-      @config  = config
-      @bunny   = Bunny.new config
-      @pool    = Pool.new Dispatcher, size: config[:size]
+      @config = config
     end
 
     def running?; @running end
@@ -51,10 +49,8 @@ module Msgr
     def start
       log(:info) { "Start client to #{uri}" }
 
-      @bunny.start
-      @pool.start
-      @running = true
-      new_connection
+      init
+      launch
 
       log(:info) { 'Client started.' }
     end
@@ -109,5 +105,17 @@ module Msgr
     rescue TimeoutError
       log(:warn) { "Could not shutdown pool within #{timeout} seconds." }
     end
+
+    def init
+      @bunny = Bunny.new @config
+      @pool  = Pool.new Dispatcher, size: @config[:size]
+    end
+
+    def launch
+      @bunny.start
+      @pool.start
+      @running = true
+      new_connection
+    end
   end
 end

data/lib/msgr/railtie.rb

@@ -48,7 +48,7 @@ module Msgr
               end
 
               Msgr.client = client
-              client.start
+              client.start unless cfg[:autostart] and cfg[:autostart] == 'false'
             else
               raise ArgumentError, 'Could not load rabbitmq environment config: URI missing.'
             end

data/lib/msgr/version.rb

@@ -1,8 +1,8 @@
 module Msgr
   module VERSION
     MAJOR = 0
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 

data/spec/msgr/msgr/client_spec.rb

@@ -2,23 +2,24 @@ require 'spec_helper'
 
 describe Msgr::Client do
 
-  describe '#initialize' do
+  describe '#start' do
     let(:params) { [] }
     let(:client) { Msgr::Client.new *params }
+    before { allow_any_instance_of(Msgr::Client).to receive(:launch) }
 
     context 'with URI' do
       it 'should pass URI options to bunny (I)' do
         expect(Bunny).to receive(:new)
                          .with(pass: 'guest', user: 'guest', ssl: false, host: 'localhost', vhost: '/')
 
-        Msgr::Client.new uri: 'amqp://guest:guest@localhost/'
+        Msgr::Client.new(uri: 'amqp://guest:guest@localhost/').start
       end
 
       it 'should pass URI options to bunny (II)' do
         expect(Bunny).to receive(:new)
                          .with(pass: 'msgr', user: 'abc', ssl: true, host: 'bogus.example.org', vhost: '/rabbit')
 
-        Msgr::Client.new uri: 'amqps://abc:msgr@bogus.example.org/rabbit'
+        Msgr::Client.new(uri: 'amqps://abc:msgr@bogus.example.org/rabbit').start
       end
     end
 
@@ -27,7 +28,7 @@ describe Msgr::Client do
         expect(Bunny).to receive(:new)
                          .with(pass: 'guest', user: 'guest', ssl: false, host: 'localhost', vhost: '/')
 
-        Msgr::Client.new pass: 'guest', user: 'guest', ssl: false, host: 'localhost', vhost: '/'
+        Msgr::Client.new(pass: 'guest', user: 'guest', ssl: false, host: 'localhost', vhost: '/').start
       end
     end
 
@@ -36,14 +37,14 @@ describe Msgr::Client do
         expect(Bunny).to receive(:new)
                          .with(pass: 'msgr', user: 'abc', ssl: false, host: 'localhost', vhost: '/joghurt')
 
-        Msgr::Client.new uri: 'ampq://abc@localhost', pass: 'msgr', vhost: '/joghurt'
+        Msgr::Client.new(uri: 'ampq://abc@localhost', pass: 'msgr', vhost: '/joghurt').start
       end
 
       it 'should pass prefer hash option' do
         expect(Bunny).to receive(:new)
                          .with(ssl: true, host: 'a.example.org', vhost: '/', user: 'guest')
 
-        Msgr::Client.new uri: 'ampq://localhost', ssl: true, host: 'a.example.org'
+        Msgr::Client.new(uri: 'ampq://localhost', ssl: true, host: 'a.example.org').start
       end
     end
   end

data/spec/msgr/msgr/connection_spec.rb

@@ -7,45 +7,6 @@ describe Msgr::Connection do
     let(:routes) { Msgr::Routes.new }
     let(:connection) { Msgr::Connection.new conn, routes, dispatcher }
 
-    context 'with URI' do
-      it 'should pass URI options to bunny (I)' do
-        expect(Bunny).to receive(:new)
-                         .with(pass: 'guest', user: 'guest', ssl: false, host: 'localhost', vhost: '/')
-
-        Msgr::Client.new uri: 'amqp://guest:guest@localhost/'
-      end
-
-      it 'should pass URI options to bunny (II)' do
-        expect(Bunny).to receive(:new)
-                         .with(pass: 'msgr', user: 'abc', ssl: true, host: 'bogus.example.org', vhost: '/rabbit')
-
-        Msgr::Client.new uri: 'amqps://abc:msgr@bogus.example.org/rabbit'
-      end
-    end
-
-    context 'with options' do
-      it 'should pass options to bunny' do
-        expect(Bunny).to receive(:new)
-                         .with(pass: 'guest', user: 'guest', ssl: false, host: 'localhost', vhost: '/')
-
-        Msgr::Client.new pass: 'guest', user: 'guest', ssl: false, host: 'localhost', vhost: '/'
-      end
-    end
-
-    context 'with URI and options' do
-      it 'should pass merged options to bunny' do
-        expect(Bunny).to receive(:new)
-                         .with(pass: 'msgr', user: 'abc', ssl: false, host: 'localhost', vhost: '/joghurt')
-
-        Msgr::Client.new uri: 'ampq://abc@localhost', pass: 'msgr', vhost: '/joghurt'
-      end
-
-      it 'should pass prefer hash option' do
-        expect(Bunny).to receive(:new)
-                         .with(ssl: true, host: 'a.example.org', vhost: '/', user: 'guest')
-
-        Msgr::Client.new uri: 'ampq://localhost', ssl: true, host: 'a.example.org'
-      end
-    end
+    pending 'some tests missing -> only lets written'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt