newrelic_rpm 2.14.1.logging1 → 2.14.1

data/CHANGELOG

@@ -1,6 +1,3 @@
-v2.14.1.logging1
-  * Special debug logging build, for all those fans of War and Peace out there
-
 v2.14.1
   * Avoid overriding methods named 'log' when including the MethodTracer module
   * Ensure that all load paths for 'new_relic/agent' go through 'new_relic/control' first

data/lib/new_relic/control/logging_methods.rb

@@ -26,7 +26,6 @@ module NewRelic
       end
 
       def should_log?
-        return true # debug build! always log, ALWAYS
         @settings && agent_enabled?
       end
 
@@ -42,17 +41,15 @@ module NewRelic
         end
 
         # set the log level as specified in the config file
-        
-        # debug build! Always log everything!
-        log.level = Logger::DEBUG
-#         case fetch("log_level","info").downcase
-#           when "debug" then log.level = Logger::DEBUG
-#           when "info" then log.level = Logger::INFO
-#           when "warn" then log.level = Logger::WARN
-#           when "error" then log.level = Logger::ERROR
-#           when "fatal" then log.level = Logger::FATAL
-#         else log.level = Logger::INFO
-#         end
+
+        case fetch("log_level","info").downcase
+          when "debug" then log.level = Logger::DEBUG
+          when "info" then log.level = Logger::INFO
+          when "warn" then log.level = Logger::WARN
+          when "error" then log.level = Logger::ERROR
+          when "fatal" then log.level = Logger::FATAL
+        else log.level = Logger::INFO
+        end
         log
       end
 

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 2
     MINOR = 14
     TINY  = 1
-    BUILD = 'logging1' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = nil #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic_rpm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.14.1.logging1"
+  s.version = "2.14.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Justin George"]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 897997444
-  prerelease: true
+  hash: 53
+  prerelease: false
   segments: 
   - 2
   - 14
   - 1
-  - logging1
-  version: 2.14.1.logging1
+  version: 2.14.1
 platform: ruby
 authors: 
 - Bill Kayser