bmc-daemon-lib 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 717e62be1cf40cba5d185e3b874bf118ad484f16
-  data.tar.gz: 8e7009af53b97eccda6ad9a6b9b4908d97a571a9
+  metadata.gz: 1771d9c5fcae4ddbf8779639cd94f3155144b309
+  data.tar.gz: 2040e4242235669e72057e2a4da917d6c2918d4a
 SHA512:
-  metadata.gz: e8298d97416782976d686687db0ecb799a86a7541ce3c69e88b8e4248e96556c1c3d2980a50d72e0638b4487c8ff2c996734e071bbad40a138dae08bb7121e80
-  data.tar.gz: 902afa597271e91c5debdbf87a86e7cede27c5b1d13adbcd079cda992734746be61edf47041401321ac66d3792e52e82f41ff838e49d012eb61b788b40da3c33
+  metadata.gz: 355980e1711281c1be04016f59e838b655b720da1c7261b123403debad4a7803c7bf9bf4ccef2770b52da90b15eae10cd42dfb1fbbe96f9a05501bc14b1fcc41
+  data.tar.gz: f9c6d1af6e0a152668b5b7c43b9094932f148f0783f8c40f6df72f3734e116bc0ebe57594321bce8548fb7209142173e0a813e5c841136fc176e60629d3ee0e2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bmc-daemon-lib (0.4.1)
+    bmc-daemon-lib (0.4.2)
       chamber (~> 2.9.1)
 
 GEM

data/bmc-daemon-lib.gemspec

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

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

@@ -185,30 +185,31 @@ module BmcDaemonLib
       return unless self.feature?(:newrelic)
 
       # Ok, let's start
-      section = self[:newrelic]
       log :conf, "prepare NewRelic"
+      conf = self[:newrelic]
 
       # Enable GC profiler
       GC::Profiler.enable
 
       # Build NewRelic app_name if not provided as-is
-      if !section[:app_name]
-        stack = []
-        stack << (section[:prefix] || @app_name)
-        stack << section[:platform] if section[:platform]
-        stack << @app_env
-        text = stack.join('-')
-        section[:app_name] = "#{text}; #{text}-#{host}"
-      end
+      self.newrelic_init_app_name(conf)
+
+      # Set env variables
+      ENV["NEW_RELIC_AGENT_ENABLED"] = "true"
+      ENV["NEW_RELIC_LOG"] = logfile_path(:newrelic)
+      ENV["NEW_RELIC_LICENSE_KEY"] = conf[:license].to_s
+      ENV["NEW_RELIC_APP_NAME"] = conf[:app_name].to_s
 
+      # logger_newrelic = Logger.new('/tmp/newrelic.log')
+      # logger_newrelic.debug Time.now()
       # 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,
-      })
+      # NewRelic::Agent.manual_start({
+      #   agent_enabled: true,
+      #   log: logger_newrelic,
+      #   env: @app_env,
+      #   license_key: conf[:license].to_s,
+      #   app_name: conf[:app_name].to_s,
+      # })
     end
 
     def self.prepare_rollbar
@@ -221,13 +222,13 @@ module BmcDaemonLib
       end
 
       # Ok, let's start
-      section = self[:rollbar]
       log :conf, "prepare Rollbar"
+      conf = self[:rollbar]
 
       # Configure
       Rollbar.configure do |config|
         config.enabled = true
-        config.access_token = section[:token].to_s
+        config.access_token = conf[:token].to_s
         config.code_version = @app_version
         config.environment  = @app_env
         config.logger       = LoggerPool.instance.get(:rollbar)
@@ -249,6 +250,21 @@ module BmcDaemonLib
 
   protected
 
+    def self.newrelic_init_app_name conf
+      # Ignore if already set
+      return if conf[:app_name]
+
+      # Stack all those parts
+      stack = []
+      stack << (conf[:prefix] || @app_name)
+      stack << conf[:platform] if conf[:platform]
+      stack << @app_env
+      text = stack.join('-')
+
+      # Return a composite appname
+      conf[:app_name] = "#{text}; #{text}-#{@host}"
+    end
+
     def self.load_files
       load files: @files, namespaces: { environment: @app_env }
     end

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

@@ -14,7 +14,7 @@ module BmcDaemonLib
       trim:   400,
       }
 
-    def initialize filename, rotation
+    def initialize filename, rotation = nil
       # Initialize
       super
       @format = DEFAULT_FORMAT
@@ -30,6 +30,16 @@ module BmcDaemonLib
       end
     end
 
+    # def info message
+    #   add Logger::INFO, "INFO:#{message}"
+    # end
+    # def debug message
+    #   add Logger::DEBUG, "DEBUG:#{message}"
+    # end
+    # def error message
+    #   add Logger::ERROR, "ERROR:#{message}"
+    # end
+
     def add severity, message, context = nil, details = nil
       # Start from an empty messages list with the main message
       messages = []
@@ -76,17 +86,17 @@ module BmcDaemonLib
 
   private
 
-    # Builds prefix from @format[:context] and values
-    def build_context values
+    # Builds prefix from @format[:context] and context
+    def build_context context
       # Skip if no format defined
-      return "[context is not a hash]" unless @format[:context].is_a? Hash
+      return unless @format[:context].is_a? Hash
 
-      # Call the instance's method to get hash values
-      return "[log_context is not a hash]" unless values.is_a? Hash
+      # Call the instance's method to get hash context
+      return unless context.is_a? Hash
 
       # Build each context part
       return @format[:context].collect do |key, format|
-        sprintf(format, values[key])
+        sprintf(format, context[key])
       end.join
 
     rescue KeyError, ArgumentError => ex

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

@@ -14,7 +14,7 @@ module BmcDaemonLib
     end
 
     def log_context
-      {}      # ['DEFAULT', self.class.name.split('::').last]
+      {}
     end
 
     def log_info message, details = nil
@@ -31,16 +31,14 @@ module BmcDaemonLib
 
     def log severity, message, details
       return puts "LoggerHelper.log: missing logger (#{get_class_name})" unless logger
-      # puts "LoggerHelper.log > #{message}"
-      # puts "LoggerHelper.log     > #{get_full_context.inspect}"
-      logger.add severity, message, get_full_context, details
+      logger.add severity, message, full_context, details
     end
 
-    def get_full_context
+    def full_context
       # Grab the classe's context
       context = log_context()
 
-      # Initialize an empty context, if log_context returned something else, or it the method was not exposed
+      # Initialize an empty context, (log_context returned something bad, or method was not exposed)
       context = {} unless context.is_a? Hash
 
       # Who is the caller? Guess it from caller's class name if not provided

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

@@ -21,7 +21,7 @@ module BmcDaemonLib
       filename = Conf.logfile(pipe)
 
       # Create the logger and return it
-      logger = BmcDaemonLib::Logger.new(filename, LOG_ROTATION)   #, 10, 1024000)
+      logger = Logger.new(filename, LOG_ROTATION)   #, 10, 1024000)
       logger.progname = pipe.to_s.downcase
 
       # Finally return this logger

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

@@ -1,9 +1,4 @@
 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

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

@@ -8,7 +8,6 @@ module BmcDaemonLib
 
     def initialize wid, pool = nil
       # Logger
-      # FIXME log_pipe
       log_pipe :workers
       @log_worker_status_changes = true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bmc-daemon-lib
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Bruno MEDICI
@@ -83,7 +83,6 @@ files:
 - lib/bmc-daemon-lib.rb
 - lib/bmc-daemon-lib/conf.rb
 - lib/bmc-daemon-lib/logger.rb
-- 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

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

@@ -1,27 +0,0 @@
-module BmcDaemonLib
-  class LoggerFormatter
-
-    def self.call severity, datetime, progname, payload
-      # Build common values
-      timestamp = datetime.strftime(LOG_HEADER_TIME)
-
-      # Build header
-      header = sprintf LOG_HEADER_FORMAT,
-        timestamp,
-        Process.pid,
-        severity,
-        progname
-
-      # If we have a bunch of lines, prefix them and send them together
-      return payload.map do |line|
-        "#{header}#{trimmed(line)}\n"
-      end.join if payload.is_a?(Array)
-
-      # Otherwise, just prefix the only line
-      return "#{header}#{trimmed(payload)}\n"
-    end
-
-  protected
-
-  end
-end