bmc-daemon-lib 0.3.12 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a8fc6e53d26c10707cdbc0a2475481e13905d12
-  data.tar.gz: 3fa1c0534f69a402c9373b02e638e47dd6f5f487
+  metadata.gz: fef18aedd6818e48a75388b4846eed1888c99798
+  data.tar.gz: 6a9cc6898093c487798628a1bb2e2c5af6657d24
 SHA512:
-  metadata.gz: 2b1200bb25c93bf91d67b9ed69623cc85e65836bd69cbf2b45f5efd6f1211e6833e0f6563efbe8d2a0a0bb3ff6c41f7c8eee3c95a4bead0feb79e7a76fa0affe
-  data.tar.gz: 28521bb664156224158ff44630091ff9757d6f2334123ee106e037a1cdea496f5a28cd28096b7071916fcfc973076824b9364cf074c4bb2f0aea35e36d3a0c8c
+  metadata.gz: 646b6fe2be7e4716b3e50cd5b9307ba769105b949f65a0727c82c3d29053998002ee56d80d01f4fb84abaf36a8d93d69d69116a169ecc57739388c5e4d24916a
+  data.tar.gz: 7f8b49162ab83e593fe0b7a3b7572c71128591d48fca1af62666a7a60f7185faa30c53fc51a0fb670a197e2095d454669ee25544e9b92342e0bd2634f54f992d

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bmc-daemon-lib (0.3.12)
+    bmc-daemon-lib (0.3.14)
       chamber (~> 2.9)
 
 GEM

data/bmc-daemon-lib.gemspec

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

data/lib/bmc-daemon-lib.rb

@@ -10,4 +10,5 @@ require_relative "bmc-daemon-lib/logger_formatter"
 require_relative "bmc-daemon-lib/logger_helper"
 require_relative "bmc-daemon-lib/logger_pool"
 require_relative "bmc-daemon-lib/worker_base"
+require_relative "bmc-daemon-lib/mq_endpoint"
 require_relative "bmc-daemon-lib/mq_consumer"

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

@@ -6,47 +6,24 @@ module BmcDaemonLib
   protected
 
     def log_info message, details = nil
-      build_messages Logger::INFO, message, details
+      log Logger::INFO, message, details
     end
 
     def log_error message, details = nil
-      build_messages Logger::ERROR, message, details
+      log Logger::ERROR, message, details
     end
 
     def log_debug message, details = nil
-      build_messages Logger::DEBUG, message, details
+      log Logger::DEBUG, message, details
     end
 
     alias info log_info
     alias error log_error
     alias debug log_debug
 
-  private
+    def log severity, message, details = nil
+      fail "LoggerHelper.log: invalid logger" unless logger.respond_to? :add
 
-    # Builds prefix if LOG_PREFIX_FORMAT defined and caller has log_prefix method to provide values
-    def build_prefix
-      # Skip if no format defined
-      return unless defined?('LOG_PREFIX_FORMAT')
-      return unless LOG_PREFIX_FORMAT.is_a? String
-
-      # Skip if no values from user class
-      return unless respond_to?(:log_prefix, true)
-      values = log_prefix
-
-      # Change to an array if not already
-      values = [values] if values.is_a? String
-
-      # Stop if still not an array
-      return unless values.is_a? Array
-
-      # Finally format the string
-      return LOG_PREFIX_FORMAT % values.map(&:to_s)
-
-    rescue ArgumentError
-      return "INVALID_FORMAT"
-    end
-
-    def build_messages severity, message, details = nil
       messages = []
 
       prefix = build_prefix
@@ -68,5 +45,34 @@ module BmcDaemonLib
       logger.add severity, messages
     end
 
+  private
+
+    # Builds prefix if LOG_PREFIX_FORMAT defined and caller has log_prefix method to provide values
+    def build_prefix
+      # Skip if no format defined
+      return unless defined?('LOG_PREFIX_FORMAT')
+      return unless LOG_PREFIX_FORMAT.is_a? String
+
+      # At start, values is an empty array
+      values = nil
+
+      # Call the instance's method
+      if respond_to?(:log_prefix, true)
+        values = log_prefix
+      end
+
+      # Change to an array if a simple string
+      values = [values] if values.is_a? String
+
+      # Ensure we always have an array (method not found, or log_prefix returning something else)
+      values = [] unless values.is_a? Array
+
+      # Finally format the string
+      return LOG_PREFIX_FORMAT % values.map(&:to_s)
+
+    rescue ArgumentError => ex
+      return "(LOG_PREFIX_FORMAT has an invalid format)"
+    end
+
   end
 end

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

@@ -1,92 +1,65 @@
 module BmcDaemonLib
-  # class ShouterResponseError       < StandardError; end
-  # class ShouterChannelClosed       < StandardError; end
-  # class ShouterPreconditionFailed  < StandardError; end
-  # class ShouterInterrupted         < StandardError; end
-  # class EndpointTopicContext       < StandardError; end
-  class EndpointConnexionContext    < StandardError; end
-  class EndpointConnectionError     < StandardError; end
-  class EndpointSubscribeContext    < StandardError; end
-  class EndpointSubscribeError      < StandardError; end
-
-  class MqConsumer
-    include LoggerHelper
-    attr_reader :logger
+  class MqConsumerError              < StandardError; end
 
-  protected
+  class MqConsumer < MqEndpoint
 
-    def log_prefix
-      self.class.name.split('::').last
-    end
+    include LoggerHelper
+    attr_reader :logger
 
-    def subscribe_on_queue name
-      info "use_queue [#{name}]"
+    def subscribe_to_queue name, context = nil
+      log_info "subscribe_to_queue [#{name}]"
 
       # Queue for this rule
       @queue = @channel.queue(name, auto_delete: false, durable: true)
 
       # Create consumer on this queue
       @queue.subscribe(manual_ack: AMQP_MANUAL_ACK, on_cancellation: :consumer_cancelled) do |delivery_info, metadata, payload|
-        # Prepare data
-        msg_exchange = delivery_info.exchange
-        msg_rkey = delivery_info.routing_key.force_encoding('UTF-8')
-        msg_tag = delivery_info.delivery_tag
+        handle_receive context, delivery_info, metadata, payload
+      end
+    end
 
-        msg_headers = metadata.headers || {}
+    def listen_to topic, rkey
+      # Exchange to this rule
+      exchange = @channel.topic(topic, durable: true, persistent: false)
 
-        # Extract payload
-        msg_data = payload_parse payload, metadata.content_type
+      log_info "listen_to [#{topic}] [#{rkey}] > [#{@queue.name}]"
+      @queue.bind exchange, routing_key: rkey
+    end
 
-        # Announce
-        announce    msg_rkey, msg_tag, msg_data, metadata,      msg_exchange, payload.bytesize
+  protected
 
-        # Hand to the callback
-        receive     msg_rkey, msg_tag, msg_data, metadata,      delivery_info
-      end
-    end
+    def handle_receive context, delivery_info, metadata, payload
+      # raise MqConsumerError, "testing!"
 
-    def announce msg_rkey, msg_tag, msg_data, metadata, msg_exchange, payload_bytesize
       # Prepare data
+      msg_topic = delivery_info.exchange
+      msg_rkey = delivery_info.routing_key.force_encoding('UTF-8')
+      msg_tag = delivery_info.delivery_tag
       msg_headers = metadata.headers || {}
 
+      # Extract payload
+      msg_data = payload_parse payload, metadata.content_type
+
       # Announce match
-      log_message MSG_RECV, msg_exchange, msg_rkey, msg_data, {
-        'channel.dtag' => "#{@channel.id}.#{msg_tag}",
-        'app-id' => metadata.app_id,
-        'content-type' => metadata.content_type,
-        'delay (ms)' => extract_delay(msg_headers),
-        'body size' => format_bytes(payload_bytesize, "B"),
+      payload_bytesize = payload.bytesize
+      log_message MSG_RECV, msg_topic, msg_rkey, msg_data, {
+        app_id:       metadata.app_id,
+        channel_tag:  "#{@channel.id}.#{msg_tag}",
+        content_type: metadata.content_type,
+        delay_ms:     extract_delay(msg_headers),
+        body_size:    format_bytes(payload_bytesize, "B"),
         }
-    end
-
-    def bind_on topic, route
-      # Exchange to this rule
-      exchange = @channel.topic(topic, durable: true, persistent: false)
 
-      info "bind_on [#{topic}] [#{route}] > [#{@queue.name}]"
-      @queue.bind exchange, routing_key: route
+      # Hand to the callback
+      handle_message context, metadata, delivery_info,
+        topic: msg_topic,
+        rkey: msg_rkey,
+        tag: msg_tag,
+        data: msg_data
     end
 
     def consumer_cancelled all={}
-      error "consumer cancelled remotely: #{all.inspect}"
-    end
-
-    def identifier len
-      rand(36**len).to_s(36)
-    end
-
-    def log_message msg_way, msg_exchange, msg_key, msg_body = [], msg_attrs = {}
-      # Message header
-      info sprintf("%3s %-15s %s", msg_way, msg_exchange, msg_key)
-
-      # Body lines
-      if msg_body.is_a?(Enumerable) && !msg_body.empty?
-        body_json = JSON.pretty_generate(msg_body)
-        log_debug nil, body_json.lines
-      end
-
-      # Attributes lines
-      log_debug nil, msg_attrs if msg_attrs
+      log_error "consumer_cancelled remotely: #{all.inspect}"
     end
 
     def extract_delay msg_headers
@@ -101,19 +74,8 @@ module BmcDaemonLib
       return ((Time.now - sent_at)*1000).round(2)
     end
 
-    def format_bytes number, unit="", decimals = 0
-      return "&Oslash;" if number.nil? || number.to_f.zero?
-
-      units = ["", "k", "M", "G", "T", "P" ]
-      index = ( Math.log(number) / Math.log(2) ).to_i / 10
-      converted = number.to_f / (1024 ** index)
-
-      truncated = converted.round(decimals)
-      return "#{truncated} #{units[index]}#{unit}"
-    end
-
-    def receive delivery_info, metadata, payload
-      debug "MqConsumer.receive"
+    def handle_message context, metadata, delivery_info, message = {}
+      log_error "MqConsumer.handle_message [#{context.to_s}] #{message.inspect}"
     end
 
     def payload_parse payload, content_type #, fields = []

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

@@ -0,0 +1,78 @@
+module BmcDaemonLib
+  # class ShouterResponseError       < StandardError; end
+  # class ShouterChannelClosed       < StandardError; end
+  # class ShouterPreconditionFailed  < StandardError; end
+  # class ShouterInterrupted         < StandardError; end
+  # class EndpointTopicContext       < StandardError; end
+  class EndpointConnexionContext    < StandardError; end
+  class EndpointConnectionError     < StandardError; end
+  class EndpointSubscribeContext    < StandardError; end
+  class EndpointSubscribeError      < StandardError; end
+
+  class MqEndpoint
+    include LoggerHelper
+    attr_reader :logger
+
+  protected
+
+    def log_prefix
+      self.class.name.split('::').last
+    end
+
+    def log_message msg_way, msg_topic, msg_key, msg_body = [], msg_attrs = {}
+      # Message header
+      log_info sprintf("%4s %-20s %s", msg_way, msg_topic, msg_key)
+
+      # Message attributes
+      log_debug nil, msg_attrs if msg_attrs
+
+      # Body lines
+      if msg_body.is_a?(Enumerable) && !msg_body.empty?
+        body_json = JSON.pretty_generate(msg_body)
+        log_debug nil, body_json.lines
+      end
+    end
+
+    def identifier len
+      rand(36**len).to_s(36)
+    end
+
+    def format_bytes number, unit="", decimals = 0
+      return "&Oslash;" if number.nil? || number.to_f.zero?
+
+      units = ["", "k", "M", "G", "T", "P" ]
+      index = ( Math.log(number) / Math.log(2) ).to_i / 10
+      converted = number.to_f / (1024 ** index)
+
+      truncated = converted.round(decimals)
+      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.3.12
+  version: 0.3.14
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,7 @@ files:
 - lib/bmc-daemon-lib/logger_helper.rb
 - lib/bmc-daemon-lib/logger_pool.rb
 - lib/bmc-daemon-lib/mq_consumer.rb
+- lib/bmc-daemon-lib/mq_endpoint.rb
 - lib/bmc-daemon-lib/worker_base.rb
 homepage: http://github.com/bmedici/bmc-daemon-lib
 licenses:
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: 'Shared utilities to build a daemon: logger, configuration, helpers'