rflow-components-amqp 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4205628f5286b692cf8fd1fe5bddf5a7d946a61
-  data.tar.gz: f7fff9bf0d0e968fdb3d59837c836665653d94de
+  metadata.gz: 72ceb11aa78801df45de0137699f3b72d2a16c52
+  data.tar.gz: 92994ff04ab11f0612033b81517940bec8ec486e
 SHA512:
-  metadata.gz: 65c53ef866da9fea9966472983954e8a693c222be451e33917d6212cda61f6de8895dfb3331f7a888e8229ae750cef4c75c5018c81a71717d58fad3da5f7df43
-  data.tar.gz: dc54307bc5c83b029df8f64f0661a917e021aad6a7d7f963360ae51166d2447b7d3aa4d40f719cebaf20320816805763547da80e4e5f8b1ed1bf2ba8552cf807
+  metadata.gz: f907324d9cb0c7bd0d980670f32a0e3b70391aed7b9601b47f7fba1599108aaaba5392b422c9dce5db537d7724f1d91542a105cb0a8a77f029d0cf00da102180
+  data.tar.gz: 319b3c6b80cc890bfad382e40d5ac7f430d0e97416dd337402399f7e0aead7e702e973a30f422f829624b372023bfbe48900ddcca2c85393f1114c1ee16f6168

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
 before_install:
   - sudo apt-get install libtool autoconf automake uuid-dev build-essential
   - wget http://download.zeromq.org/zeromq-3.2.4.tar.gz && tar zxvf zeromq-3.2.4.tar.gz && cd zeromq-3.2.4 && ./configure && make && sudo make install && cd ..
+  - gem update bundler
 # Only has 4.0.4, need 3.2 version due to old em-zeromq
 #  - sudo add-apt-repository -y ppa:chris-lea/zeromq
 #  - sudo apt-get update

data/lib/rflow/components/amqp/subscriber.rb

@@ -1,6 +1,7 @@
 require 'eventmachine'
 require 'amqp'
 require 'rflow'
+require 'time'
 
 class RFlow
   module Components
@@ -11,6 +12,7 @@ class RFlow
       class Subscriber < RFlow::Component
         output_port :amqp_port
         output_port :raw_port
+        output_port :log_port
 
         attr_accessor :config, :queue_config
 
@@ -20,6 +22,7 @@ class RFlow
           'username' => 'guest',
           'password' => 'guest',
           'vhost' => '/',
+          'reconnect_interval' => 20,
 
           'queue_name' => 'asdf',
           'queue_passive' => false,
@@ -33,6 +36,7 @@ class RFlow
         def configure!(config)
           @config = DEFAULT_CONFIG.merge config
           @config['port'] = @config['port'].to_i
+          @config['reconnect_interval'] = @config['reconnect_interval'].to_i
 
           ['durable', 'passive', 'exclusive', 'auto_delete'].each do |opt|
             @config["queue_#{opt}"] = to_boolean(@config["queue_#{opt}"])
@@ -48,18 +52,32 @@ class RFlow
         end
 
         def run!
-          ::AMQP.connect(:host => @config['server'], :port => @config['port'], :vhost => @config['vhost'], :username => @config['username'], :password => @config['password']) do |conn|
+          ::AMQP.connect(:host => @config['server'], :port => @config['port'], :vhost => @config['vhost'],
+                         :username => @config['username'], :password => @config['password']) do |conn|
             @amqp_connection = conn
+            RFlow.logger.info 'Connected to AMQP server...'
+
+            conn.on_disconnection do
+              RFlow.logger.error 'AMQP disconnected. Reconnecting...'
+              log_port.send_message(RFlow::Message.new('RFlow::Message::Data::Log').tap do |m|
+                m.data.timestamp = Integer(Time.now.to_f * 1000) # ms since epoch
+                m.data.level = 'INFO'
+                m.data.text = "AMQP disconnected. Reconnecting in #{@config['reconnect_interval']} seconds."
+              end)
+
+              EventMachine::Timer.new(@config['reconnect_interval']) { run! }
+            end
 
             ::AMQP::Channel.new(@amqp_connection) do |channel|
               @amqp_channel = channel
+              channel.auto_recovery = true
               @amqp_exchange = @amqp_channel.topic
 
               ::AMQP::Queue.new(@amqp_channel, @config['queue_name'], @queue_config) do |queue|
                 @amqp_queue = queue
                 @amqp_queue.bind(@amqp_exchange, :routing_key => @config['binding_pattern']).subscribe(:ack => true) do |header, payload|
                   RFlow.logger.debug { "#{name}: AMQP message received" }
-                  processing_event = RFlow::Message::ProcessingEvent.new(instance_uuid, Time.now.utc).tap do |e|
+                  processing_event = RFlow::Message::ProcessingEvent.new(uuid, Time.now.utc).tap do |e|
                     e.completed_at = Time.now.utc
                   end
 

data/lib/rflow/components/amqp/version.rb

@@ -1,7 +1,7 @@
 class RFlow
   module Components
     module AMQP
-      VERSION = "1.0.1"
+      VERSION = "1.1.0"
     end
   end
 end

data/rflow-components-amqp.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rflow', '~> 1.0.0'
+  s.add_dependency 'rflow', '~> 1.1', '>= 1.1.1'
   s.add_dependency 'amqp', '>= 0.8.0'
+  s.add_dependency 'amq-protocol', '< 2.0' # until Ruby 2.0 compatibility is achieved
 
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-collection_matchers', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rflow-components-amqp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael L. Artz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rflow
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: amq-protocol
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rflow-components-amqp
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: AMQP publisher and subscriber component for the RFlow FBP framework