bmc-daemon-lib 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd041b445612d4933a4f5f69ccb0158051892ed7
-  data.tar.gz: 5a4a9aa4dd013fb2369498d46380d5d815ebdaba
+  metadata.gz: 51d2fdee16ca885f005c34f7c8397a9d9204b43d
+  data.tar.gz: 4ec68d9f87a93f171cd02057af392500b11be85a
 SHA512:
-  metadata.gz: b98b2147d8abeb9b4f6e5214b363a14142c3beb7feff0d673b5b387a05d395f0b986f06df2735e7ea86b6dcb96c5994b01c5cd3568581a426fa2b4e1d552a813
-  data.tar.gz: 454958f16430d0be771750e5b88244d9619d3eb7e425b9c7f23bdce810fc2988c5ea22d01efc1a5b37d7c43c2c04be16894608009d61fc6ba525142860229d39
+  metadata.gz: 84f136ee87bec96835b716df93dc1faf3f3d49c9094f173928ac8b083bfb29b45cd582f7747430f2af5a2754d9c8da1ba6d8729ad54be1cbf2042a5969fa3855
+  data.tar.gz: f578421f1565e0a1cdbf15bb39eefa039e11e49dfa8173f0d825fd7a32ffacc6e703dfeb63538162989b362e864cfd9be730282ab1f37ecbe6e4cace6983963b

data/Gemfile.lock

@@ -1,13 +1,17 @@
 PATH
   remote: .
   specs:
-    bmc-daemon-lib (0.2.0)
+    bmc-daemon-lib (0.3.0)
+      bunny
       chamber (~> 2.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    amq-protocol (2.0.1)
     ast (2.3.0)
+    bunny (2.5.1)
+      amq-protocol (>= 2.0.1)
     chamber (2.9.0)
       hashie (~> 3.3)
       thor (~> 0.19.1)
@@ -22,7 +26,7 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.1)
+    rspec-core (3.5.2)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -31,7 +35,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.41.2)
+    rubocop (0.42.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)

data/bmc-daemon-lib.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.2.0"
+  spec.version                      = "0.3.0"
 
   # Project description
   spec.name                         = "bmc-daemon-lib"
@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
 
   # Runtime dependencies
   spec.add_runtime_dependency       "chamber", "~> 2.9"
+  spec.add_runtime_dependency       "bunny"
 end

data/lib/bmc-daemon-lib.rb

@@ -10,3 +10,4 @@ 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_consumer"

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

@@ -81,7 +81,9 @@ module BmcDaemonLib
       Encoding.default_external = "utf-8"
 
       # Init New Relic
-      newrelic_logfile = File.expand_path(Conf[:logs][:newrelic].to_s, Conf[:logs][:path].to_s)
+      logs_newrelic = Conf.at :logs, :newrelic
+      logs_path = Conf.at :logs, :path
+      newrelic_logfile = File.expand_path logs_newrelic.to_s, logs_path.to_s
       prepare_newrelic self[:newrelic], newrelic_logfile
 
       # Try to access any key to force parsing of the files
@@ -171,16 +173,15 @@ module BmcDaemonLib
       ENV["NEW_RELIC_MONITOR_MODE"] = "true"
 
       # Build NewRelic app_name if not provided as-is
-      if section[:app_name]
-        ENV["NEW_RELIC_APP_NAME"] = section[:app_name].to_s
-      else
+      if !section[:app_name]
         stack = []
         stack << (section[:prefix] || @app_name)
         stack << section[:platform] if section[:platform]
         stack << @app_env
         text = stack.join('-')
-        ENV["NEW_RELIC_APP_NAME"] = "#{text}-#{host};#{text}"
+        section[:app_name] = "#{text}; #{text}-#{host}"
       end
+      ENV["NEW_RELIC_APP_NAME"] = section[:app_name].to_s
 
       # Enable module
       ENV["NEWRELIC_AGENT_ENABLED"] = "true"

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

@@ -25,16 +25,25 @@ module BmcDaemonLib
 
     # 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
 
-      # Skip if no format defined
-      return unless defined?('LOG_PREFIX_FORMAT')
-      return unless LOG_PREFIX_FORMAT.is_a? String
+      # 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)
 
-      # Build prefix string
-      LOG_PREFIX_FORMAT % values.map(&:to_s)
+    rescue ArgumentError
+      return "INVALID_FORMAT"
     end
 
     def build_messages severity, message, details = nil

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

@@ -6,7 +6,9 @@ module BmcDaemonLib
   class LoggerPool
     include Singleton
 
-    def get pipe
+    def get pipe = nil
+      pipe =  :default if pipe.to_s.blank?
+
       @loggers ||= {}
       @loggers[pipe] ||= create(pipe)
     end
@@ -31,7 +33,7 @@ module BmcDaemonLib
 
     def logfile pipe
       # Disabled if no valid config
-      return nil unless Conf[:logs].is_a?(Hash)
+      return nil unless Conf[:logs].is_a?(Hash) && Conf.at(:logs, pipe)
 
       # Compute logfile and check if we can write there
       logfile = File.expand_path(Conf[:logs][pipe].to_s, Conf[:logs][:path].to_s)

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

@@ -0,0 +1,168 @@
+require "bunny"
+
+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
+
+  protected
+
+    def log_prefix
+      self.class.name.split('::').last
+    end
+
+    def subscribe_on_queue name
+      info "use_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
+
+        msg_headers = metadata.headers || {}
+
+        # Extract payload
+        msg_data = payload_parse payload, metadata.content_type
+
+        # Announce
+        announce    msg_rkey, msg_tag, msg_data, metadata,      msg_exchange, payload.bytesize
+
+        # Hand to the callback
+        receive     msg_rkey, msg_tag, msg_data, metadata,      delivery_info
+      end
+    end
+
+    def announce msg_rkey, msg_tag, msg_data, metadata, msg_exchange, payload_bytesize
+      # Prepare data
+      msg_headers = metadata.headers || {}
+
+      # 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"),
+        }
+    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
+    end
+
+    def consumer_cancelled all={}
+      error "consumer cancelled remotely: #{all.inspect}"
+    end
+
+    # Start connexion to RabbitMQ
+    def connect_to busconf
+      fail PushyDaemon::EndpointConnexionContext, "invalid bus host/port" unless busconf
+      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 PushyDaemon::EndpointConnectionError, "error connecting (#{e.class})"
+    rescue StandardError => e
+      fail PushyDaemon::EndpointConnectionError, "unknow (#{e.inspect})"
+    else
+      return conn
+    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
+    end
+
+    def extract_delay msg_headers
+      return unless msg_headers['sent_at']
+
+      # Extract sent_at header
+      sent_at = Time.iso8601(msg_headers['sent_at']) rescue nil
+      # log_info "sent_at     : #{sent_at.to_f}"
+      # log_info "timenow     : #{Time.now.to_f}"
+
+      # Compute delay
+      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"
+    end
+
+    def payload_parse payload, content_type #, fields = []
+      # Force encoding (pftop...)
+      utf8payload = payload.to_s.force_encoding('UTF-8')
+
+      # Parse payload if content-type provided
+      case content_type
+        when "application/json"
+          return JSON.parse utf8payload rescue nil
+        when "text/plain"
+          return utf8payload.to_s
+        else
+          return utf8payload
+      end
+
+    # Handle body parse errors
+    rescue Encoding::UndefinedConversionError => e
+      log_error "parse: JSON PARSE ERROR: #{e.inspect}"
+      return {}
+    end
+
+  end
+end

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

@@ -16,10 +16,8 @@ module BmcDaemonLib
       @config = {}
 
       # Set thread context
-      @pool = pool
-      @wid = wid
-      Thread.current.thread_variable_set :pool, pool
-      Thread.current.thread_variable_set :wid, wid
+      Thread.current.thread_variable_set :pool, (@pool = pool)
+      Thread.current.thread_variable_set :wid, (@wid = wid)
       Thread.current.thread_variable_set :started_at, Time.now
       worker_status WORKER_STATUS_STARTING
 
@@ -78,11 +76,11 @@ module BmcDaemonLib
       return unless @log_worker_status_changes
 
       # Log this status change
-      if job.is_a?(Job)
-        log_info "status [#{status}] on job[#{job.id}] status[#{job.status}] error[#{job.error}]"
-      else
-        log_info "status [#{status}]"
-      end
+      # if defined?'Job' && job.is_a?(Job)
+      #   log_info "status [#{status}] on job[#{job.id}] status[#{job.status}] error[#{job.error}]"
+      # else
+      log_info "status [#{status}]"
+      # end
     end
 
     def worker_jid jid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc-daemon-lib
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Shared utilities to build a daemon: logger, configuration, helpers'
 email: bmc-daemon-lib@bmconseil.com
 executables: []
@@ -98,6 +112,7 @@ files:
 - lib/bmc-daemon-lib/logger_formatter.rb
 - 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/worker_base.rb
 homepage: http://github.com/bmedici/bmc-daemon-lib
 licenses: