bmc-daemon-lib 0.3.16 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 979aa39471d0f78ea2463c44e0471def495dbfc9
-  data.tar.gz: 3fab11319297f7f7c77c1cb2b6056cf72f492856
+  metadata.gz: 2e5609f9590972c691a3756c1af6bd9ad1ee0282
+  data.tar.gz: 6a3ee2207696ebc991abb0992a8334f5db0e0856
 SHA512:
-  metadata.gz: 4c005bc13c44b365c8b207e12412ff710c0605dfbf0685ec5962c8c620c27fa37d633c2f3f3f7ced7c251a9f2d37dd7214c1d8de2bf64a1c7a3f661d498930ce
-  data.tar.gz: 2a2813cd028bbfd6d656aca6f33bf6d1be415032dc75f16e35f2a16fa93c1eccd1f2f17961935b5f17afc5240acc693acd85e22772b294393c375f1e4e99ae84
+  metadata.gz: 94186c5a6810b5c363bc6991ed5a8fc4d83cda7db8a3bcdb36442a2793efb411aa47e1dc2c957a90d6d810318556baf9f07dae00e81861c568f9115ce22ac1e9
+  data.tar.gz: 2c04229dd313885efd3b7cebc8202f8074d4fc46f6e01fe6e86b75445452ac17859f41397fc43a70d36754945c2f7fbad71a1b169a66584f89b787f268b3cb76

data/Gemfile.lock

@@ -1,22 +1,17 @@
 PATH
   remote: .
   specs:
-    bmc-daemon-lib (0.3.16)
+    bmc-daemon-lib (0.3.18)
       chamber (~> 2.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.3.0)
     chamber (2.9.1)
       hashie (~> 3.3)
       thor (~> 0.19.1)
     diff-lcs (1.2.5)
-    hashie (3.4.4)
-    parser (2.3.1.2)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.1.0)
+    hashie (3.4.6)
     rake (11.2.2)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -31,15 +26,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.42.0)
-      parser (>= 2.3.1.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.1)
-    unicode-display_width (1.1.1)
 
 PLATFORMS
   ruby
@@ -49,7 +36,6 @@ DEPENDENCIES
   bundler (~> 1.6)
   rake
   rspec
-  rubocop
 
 BUNDLED WITH
    1.12.5

data/bmc-daemon-lib.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.3.16"
+  spec.version                      = "0.3.18"
 
   # Project description
   spec.name                         = "bmc-daemon-lib"
@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency   "bundler", "~> 1.6"
   spec.add_development_dependency   "rake"
   spec.add_development_dependency   "rspec"
-  spec.add_development_dependency   "rubocop"
 
   # Runtime dependencies
   spec.add_runtime_dependency       "chamber", "~> 2.9"

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

@@ -78,10 +78,6 @@ module BmcDaemonLib
       Encoding.default_internal = "utf-8"
       Encoding.default_external = "utf-8"
 
-      # Init New Relic, Rollbar
-      # prepare_newrelic
-      #prepare_rollbar  if self.feature?(:rollbar)
-
       # Try to access any key to force parsing of the files
       self[:dummy]
 
@@ -108,21 +104,30 @@ module BmcDaemonLib
       path.reduce(Conf) { |m, key| m && m[key.to_s] }
     end
 
-    def self.logfile_path pipe
-      # Access configuration
-      path      = Conf.at :logs, :path
-      specific  = Conf.at :logs, pipe
-      default   = Conf.at :logs, :default
-
-      # Ignore if explicitely disabled
-      return nil if specific.nil?
-
-      # Fallback on default path if not provided,
-      specific  ||= default
-      specific  ||= "default.log"
+    def self.logfile pipe
+      # Build logfile from Conf
+      logfile = self.logfile_path(pipe)
+      return nil if logfile.nil?
+
+      # Check that we'll be able to create logfiles
+      if File.exists?(logfile)
+        # File is there, is it writable ?
+        unless File.writable?(logfile)
+          log :conf, "logging [#{pipe}] disabled: file not writable [#{logfile}]"
+          return nil
+        end
+      else
+        # No file here, can we create it ?
+        logdir = File.dirname(logfile)
+        unless File.writable?(logdir)
+          log :conf, "logging [#{pipe}] disabled: directory not writable [#{logdir}]"
+          return nil
+        end
+      end
 
-      # Build logfile_path
-      File.expand_path specific.to_s, path.to_s
+      # OK, return a clean file path
+      log :conf, "logging [#{pipe}] to [#{logfile}]"
+      return logfile
     end
 
     def self.feature? name
@@ -178,16 +183,14 @@ module BmcDaemonLib
     def self.prepare_newrelic
       # Disable if no config present
       return unless self.feature?(:newrelic)
+
+      # Ok, let's start
       section = self[:newrelic]
+      log :conf, "prepare NewRelic"
 
       # Enable GC profiler
       GC::Profiler.enable
 
-      # Set logfile, license, monitor mode
-      ENV["NEW_RELIC_LOG"]          = logfile_path(:newrelic)
-      ENV["NEW_RELIC_LICENSE_KEY"]  = section[:license].to_s
-      ENV["NEW_RELIC_MONITOR_MODE"] = "true"
-
       # Build NewRelic app_name if not provided as-is
       if !section[:app_name]
         stack = []
@@ -197,10 +200,15 @@ module BmcDaemonLib
         text = stack.join('-')
         section[:app_name] = "#{text}; #{text}-#{host}"
       end
-      ENV["NEW_RELIC_APP_NAME"]     = section[:app_name].to_s
 
-      # Enable module
-      ENV["NEWRELIC_AGENT_ENABLED"] = "true"
+      # Start the agent
+      NewRelic::Agent.manual_start({
+        agent_enabled: true,
+        log: LoggerPool.instance.get(:newrelic),
+        env: @app_env,
+        license_key: section[:license].to_s,
+        app_name: section[:app_name].to_s,
+      })
     end
 
     def self.prepare_rollbar
@@ -212,7 +220,9 @@ module BmcDaemonLib
         return
       end
 
+      # Ok, let's start
       section = self[:rollbar]
+      log :conf, "prepare Rollbar"
 
       # Configure
       Rollbar.configure do |config|
@@ -220,8 +230,7 @@ module BmcDaemonLib
         config.access_token = section[:token].to_s
         config.code_version = @app_version
         config.environment  = @app_env
-        #config.logger       = Logger.new(logfile_path(:rollbar))
-        config.logger       = LoggerPool.instance.get :rollbar
+        config.logger       = LoggerPool.instance.get(:rollbar)
         config.use_async = true
       end
 
@@ -231,7 +240,7 @@ module BmcDaemonLib
 
     def self.log origin, message
       printf(
-        "%s %-10s %s \n",
+        "%s %-14s %s \n",
         Time.now.strftime("%Y-%m-%d %H:%M:%S"),
         origin,
         message
@@ -248,6 +257,24 @@ module BmcDaemonLib
       @files << File.expand_path(path) if path && File.readable?(path)
     end
 
+    def self.logfile_path pipe
+      # Access configuration
+      path      = self.at :logs, :path
+      specific  = self.at :logs, pipe
+      default   = self.at :logs, :default
+
+      # Ignore if explicitely disabled
+      return nil if specific.nil?
+      return nil if specific == false
+
+      # Fallback on default path if not provided,
+      specific ||= default
+      specific ||= "default.log"
+
+      # Build logfile_path
+      File.expand_path specific.to_s, path.to_s
+    end
+
   private
 
     def self.ensure_init

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

@@ -5,20 +5,20 @@ require "singleton"
 module BmcDaemonLib
   class LoggerPool
     include Singleton
-
     LOG_ROTATION            = "daily"
 
     def get pipe = nil
       # If not provided, use :default
       pipe = :default if pipe.to_s.empty?
 
+      # Instantiate a logger or return the existing one
       @loggers ||= {}
       @loggers[pipe] ||= create(pipe)
     end
 
     def create pipe
       # Compute logfile or STDERR, and declare what we're doing
-      filename = logfile(pipe)
+      filename = Conf.logfile(pipe)
 
       # Create the logger and return it
       logger = Logger.new(filename, LOG_ROTATION)   #, 10, 1024000)
@@ -29,42 +29,7 @@ module BmcDaemonLib
       logger
 
     rescue Errno::EACCES
-      log "create [#{pipe}]: access error"
-    end
-
-  protected
-
-    def logfile pipe
-      # Disabled if no valid config
-      #return nil unless Conf[:logs].is_a?(Hash) && Conf.at(:logs, pipe)
-
-      # Build logfile from Conf
-      logfile = Conf.logfile_path pipe
-      return nil if logfile.nil?
-
-      # Check that we'll be able to create logfiles
-      if File.exists?(logfile)
-        # File is there, is it writable ?
-        unless File.writable?(logfile)
-          log "logging [#{pipe}] to [#{logfile}] disabled: file not writable [#{logfile}]"
-          return nil
-        end
-      else
-        # No file here, can we create it ?
-        logdir = File.dirname(logfile)
-        unless File.writable?(logdir)
-          log "logging [#{pipe}] [#{logfile}] disabled: directory not writable [#{logdir}]"
-          return nil
-        end
-      end
-
-      # OK, return a clean file path
-      log "logging [#{pipe}] to [#{logfile}]"
-      return logfile
-    end
-
-    def log message
-      Conf.log :logger, message
+      $stderr.puts "LoggerPool: create [#{pipe}]: access error"
     end
 
   end

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

@@ -47,6 +47,7 @@ module BmcDaemonLib
       payload_bytesize = payload.bytesize
       log_message MSG_RECV, msg_topic, msg_rkey, msg_data, {
         app_id:       metadata.app_id,
+        sent_at:      msg_headers['sent_at'],
         channel_tag:  "#{@channel.id}.#{msg_tag}",
         content_type: metadata.content_type,
         delay_ms:     extract_delay(msg_headers),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc-daemon-lib
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.18
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: chamber
   requirement: !ruby/object:Gem::Requirement