bmc-daemon-lib 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18deb3596feca659c7ce4a35ef28edec27c7d71a
-  data.tar.gz: 0ab6ac969b62f4335bad4c9eff4f1fd15ee415c3
+  metadata.gz: 9d35dc7459d4725ea9f2234844440abe29cad87b
+  data.tar.gz: 3dc02b5f47fab8ecbc0271ca35c083d0274c2412
 SHA512:
-  metadata.gz: 8fd5e89874440d49c7c39a7b4e00ffa8c2d5a7d25c7017e87c6a75f885b5e466e5082540c707e12abb7cd046656aa3dd6bbfb377a25e9e77abeeea96dce39f7e
-  data.tar.gz: 1d82b98d0c87766214c7584bc61cba9d8476cda1ee89423f057433fe2da851521e6dd3b979f40210930de17d059df522cb05814ce9e478bd7fed72e39c33c35a
+  metadata.gz: 780b1db309c13e2f35d26748f82159addb7184a1bfcb359f9bb5f8e0d14baee7184ca8b8b8e76a70d4003671e6d2238fb286af53d14fb5a901061599d01ad130
+  data.tar.gz: 8542935eeca326c272a8b5bcf067a779842a1d6f0e30af62601282cf75d17bc34654b250e80886743649dff55d186ee41981ffabd420a30e9caefeb9cdefeb2d

data/.gitignore

@@ -11,6 +11,11 @@
 /tmp/
 /.idea
 
+Gemfile.lock
+.ruby-version
+.ruby-gemset
+
+
 # Used by dotenv library to load environment variables.
 # .env
 

data/bmc-daemon-lib.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.9.2"
+  spec.version                      = "0.10.0"
 
   # Project description
   spec.name                         = "bmc-daemon-lib"

data/lib/bmc-daemon-lib/mq_consumer.rb

@@ -9,7 +9,14 @@ module BmcDaemonLib
     include LoggerHelper
 
     def subscribe_to_queue name, context = nil
-      log_info "subscribe_to_queue [#{name}]"
+      log_debug "subscribe_to_queue [#{name}]"
+
+      # Ensure a channel has been successfully opened first
+      unless @channel
+        error = "subscribe_to_queue: no active channel (call subscribe_to_queue beforehand)"
+        log_error error
+        raise MqConsumerException, error
+      end
 
       # Queue for this rule
       @queue = @channel.queue(name, auto_delete: false, durable: true)
@@ -21,18 +28,34 @@ module BmcDaemonLib
     end
 
     def listen_to topic, rkey
-      # puts "listen_to(#{topic},#{rkey})"
       log_info "listen_to [#{topic}] [#{rkey}] > [#{@queue.name}]"
-      @queue.bind topic, routing_key: rkey
+
+      # Ensure a queue has been successfully subscribed first
+      unless @queue
+        error = "listen_to: no active queue (call subscribe_to_queue beforehand)"
+        log_error error
+        raise MqConsumerException, error
+      end
+
+      # Link or create exchange
+      exchange = @channel.topic(topic, durable: true)
+
+      # puts "listen_to(#{topic},#{rkey})"
+      @queue.bind exchange, routing_key: rkey
 
       # Handle errors
-      rescue Bunny::NotFound => e
-        log_error "exchange not found: #{e.inspect}"
-        raise MqConsumerTopicNotFound, e.message
+      # rescue Bunny::NotFound => e
+      #   log_debug "creating missing exchange [#{topic}]"
+      #   @channel.topic topic, durable: false, auto_delete: true
+      #   retry
+      #   # raise MqConsumerTopicNotFound, e.message
 
       rescue StandardError => e
-        log_error "UNEXPECTED EXCEPTION: #{e.inspect}"
+        log_error "UNEXPECTED: #{e.inspect}"
         raise MqConsumerException, e.message
+
+      else
+      #   log_debug "bound queue [#{@queue.name}] on topic [#{topic}]"
     end
     
   protected

data/lib/bmc-daemon-lib/mq_endpoint.rb

@@ -1,11 +1,14 @@
 module BmcDaemonLib
-  class EndpointConnexionContext    < StandardError; end
-  class EndpointConnectionError     < StandardError; end
-  class EndpointSubscribeContext    < StandardError; end
-  class EndpointSubscribeError      < StandardError; end
 
   class MqEndpoint
     include LoggerHelper
+    attr_accessor :logger
+
+    def initialize channel, *args
+      # Init
+      @channel = channel
+      log_info "MqEndpoint on channel [#{@channel.id}]"
+    end
 
   protected
 
@@ -38,31 +41,5 @@ module BmcDaemonLib
       return "#{truncated} #{units[index]}#{unit}"
     end
 
-    # Start connexion to RabbitMQ
-    def connect_to busconf
-      fail BmcDaemonLib::EndpointConnexionContext, "connect_to/busconf" unless busconf
-      log_info "connecting to bus", {
-        broker: busconf,
-        recover: AMQP_RECOVERY_INTERVAL,
-        heartbeat: AMQP_HEARTBEAT_INTERVAL,
-        prefetch: AMQP_PREFETCH
-        }
-      conn = Bunny.new busconf.to_s,
-        logger: @logger,
-        # heartbeat: :server,
-        automatically_recover: true,
-        network_recovery_interval: AMQP_RECOVERY_INTERVAL,
-        heartbeat_interval: AMQP_HEARTBEAT_INTERVAL,
-        read_write_timeout: AMQP_HEARTBEAT_INTERVAL*2
-      conn.start
-
-    rescue Bunny::TCPConnectionFailedForAllHosts, Bunny::AuthenticationFailureError, AMQ::Protocol::EmptyResponseError  => e
-      fail BmcDaemonLib::EndpointConnectionError, "error connecting (#{e.class})"
-    rescue StandardError => e
-      fail BmcDaemonLib::EndpointConnectionError, "unknow (#{e.inspect})"
-    else
-      return conn
-    end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc-daemon-lib
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,9 +101,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/.ruby-version

@@ -1 +0,0 @@
-2.2.2

data/Gemfile.lock

@@ -1,56 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bmc-daemon-lib (0.9.2)
-      chamber
-      hashie (~> 3.4.6)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.3.0)
-    chamber (2.10.1)
-      hashie (~> 3.3)
-      thor (~> 0.19.1)
-    diff-lcs (1.3)
-    hashie (3.4.6)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.2.1)
-    rake (12.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.47.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    thor (0.19.4)
-    unicode-display_width (1.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bmc-daemon-lib!
-  bundler
-  rake
-  rspec
-  rubocop
-
-BUNDLED WITH
-   1.13.7