bmc-daemon-lib 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 826aca4700b96e6c320465e8388578e812ff513a
-  data.tar.gz: 567c3d41d7dd19b411541af24f3a39eb36fac41f
+  metadata.gz: 07d8df6da72c6e6fdaafac2a1a67b78ecf760859
+  data.tar.gz: 8f64f4c0c20bf983b5e1bb4ba4e0272737a5ec20
 SHA512:
-  metadata.gz: 46bbd87ecd0cba8321627351f27de47938014575376e97e5ea3de699556f1c3daad295284c2949ba50595b5683ff86fc1d68a17c06fb882ae44fe4cbccf428cb
-  data.tar.gz: 25fc999116f48f10ae98df12ce9a7fb706d5a649b97003eb2345f6108e58b85670552fa4f2cb4f0766f63d6703d7ed0112d4690a7a8b7f3d7670375e2e0e50d4
+  metadata.gz: 350eec5594f1353e43f7929f03eac494de915c9d29c91e3c4f507f7d736399cc23e7b409651c3be26db0dff826ca3c8c20a37f8f02fcb73685fdc3dbed05fd0f
+  data.tar.gz: a938502ae7175af87becfe05990994a18fa7f1e6f659911d162a550be18628d10deb012b772ccd314a840fd4c8c33c9d65651490175665e3bd3b5766c38aade0

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    bmc-daemon-lib (0.3.3)
+    bmc-daemon-lib (0.3.4)
       chamber (~> 2.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.3.0)
-    chamber (2.9.0)
+    chamber (2.9.1)
       hashie (~> 3.3)
       thor (~> 0.19.1)
     diff-lcs (1.2.5)

data/bmc-daemon-lib.gemspec

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

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

@@ -81,10 +81,7 @@ module BmcDaemonLib
       Encoding.default_external = "utf-8"
 
       # Init New Relic
-      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
+      prepare_newrelic self[:newrelic]
 
       # Try to access any key to force parsing of the files
       self[:dummy]
@@ -112,6 +109,23 @@ 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"
+
+      # Build logfile_path
+      File.expand_path specific.to_s, path.to_s
+    end
+
     def self.newrelic_enabled?
       ensure_init
       !! (self[:newrelic] && self[:newrelic][:license])
@@ -145,7 +159,6 @@ module BmcDaemonLib
         config_etc = self.generate(:config_etc)
 
         "A default configuration is available (#{config_defaults}) and can be copied to the default location (#{config_etc}): \n sudo cp #{config_defaults} #{config_etc}"
-
       end
     end
 
@@ -160,7 +173,7 @@ module BmcDaemonLib
       @files << File.expand_path(path) if path && File.readable?(path)
     end
 
-    def self.prepare_newrelic section, logfile
+    def self.prepare_newrelic section
       # Disable NewRelic if no config present
       return unless self.newrelic_enabled?
 
@@ -168,8 +181,8 @@ module BmcDaemonLib
       GC::Profiler.enable
 
       # Set logfile, license, monitor mode
-      ENV["NEW_RELIC_LOG"] = logfile.to_s if logfile
-      ENV["NEW_RELIC_LICENSE_KEY"] = section[:license].to_s
+      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
@@ -181,7 +194,7 @@ module BmcDaemonLib
         text = stack.join('-')
         section[:app_name] = "#{text}; #{text}-#{host}"
       end
-      ENV["NEW_RELIC_APP_NAME"] = section[:app_name].to_s
+      ENV["NEW_RELIC_APP_NAME"]     = section[:app_name].to_s
 
       # Enable module
       ENV["NEWRELIC_AGENT_ENABLED"] = "true"
@@ -193,12 +206,6 @@ module BmcDaemonLib
       unless @initialized
         fail ConfigInitiRequired, "ensure_init: Conf.init(app_root) should be invoked beforehand"
       end
-
-      # # Skip is already done
-      # return if @initialized
-
-      # # Go through init if not already done
-      # self.init
     end
 
   end

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

@@ -33,10 +33,11 @@ module BmcDaemonLib
 
     def logfile pipe
       # Disabled if no valid config
-      return nil unless Conf[:logs].is_a?(Hash) && Conf.at(:logs, pipe)
+      #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)
+      # 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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc-daemon-lib
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler