waffle 0.3.3 → 0.3.4

data/lib/waffle/base.rb

@@ -6,11 +6,7 @@ module Waffle
     end
 
     def publish(flow = 'events', message = '')
-      begin
-        @transport.publish flow, message
-      rescue
-        nil
-      end
+      @transport.publish flow, message
     end
 
     def subscribe(flow = '', &block)

data/lib/waffle/transports/rabbitmq.rb

@@ -1,14 +1,19 @@
+require 'date'
 require 'bunny'
 
 module Waffle
   module Transports
     class Rabbitmq
 
+      CONNECTION_ATTEMPT_TIMEOUT = 30
+
       EXCHANGE = 'events'
 
+      @@last_connection_attempt = Time.now
+
       def initialize
         @bunny = Bunny.new Waffle::Config.url
-        @bunny.start
+        connect
       end
 
       def encoder
@@ -16,13 +21,20 @@ module Waffle
       end
 
       def publish(flow = 'events', message = '')
-        @exchange = @bunny.exchange EXCHANGE
-        @exchange.publish message, :key => flow
+        begin
+          @exchange = @bunny.exchange EXCHANGE
+          @exchange.publish message, :key => flow
+        rescue
+          if (Time.now - @@last_connection_attempt) > CONNECTION_ATTEMPT_TIMEOUT
+            connect
+          end
+        end
       end
 
       def subscribe(flow = 'events')
         @exchange = @bunny.exchange EXCHANGE
         @queue    = @bunny.queue '', :durable => true, :auto_delete => true
+
         if flow.is_a? Array
           flow.each{ |f| @queue.bind @exchange, :key => f }
         else
@@ -34,6 +46,17 @@ module Waffle
         end
       end
 
+      private
+
+        def connect
+          begin
+            @@last_connection_attempt = Time.now
+            @bunny.start
+          rescue
+            nil
+          end
+        end
+
     end
   end
 end

data/lib/waffle/version.rb

@@ -1,5 +1,5 @@
 module Waffle
 
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waffle
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000Z
+date: 2012-04-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &75204430 !ruby/object:Gem::Requirement
+  requirement: &76785160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75204430
+  version_requirements: *76785160
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &75203820 !ruby/object:Gem::Requirement
+  requirement: &76783560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75203820
+  version_requirements: *76783560
 description: Client part of Patty statistics server
 email: alexander.lomakin@gmail.com
 executables: []