gray_logger 0.11.4 → 0.11.5

data/lib/gray_logger/configuration.rb

@@ -4,18 +4,28 @@ module GrayLogger
 
     attr_accessor :host, :port, :size, :automatic_logging, :logger_level, :options
     def initialize(configuration_hash)
-      defaults = {
-        :size => "WAN",
-        :facility => "facility-not-defined"
-      }
+      unless configuration_hash.nil?
+        configuration = configuration_hash.dup
+        defaults = {
+          :size => "WAN",
+          :facility => "facility-not-defined"
+        }
 
-      config = symbolize_keys(configuration_hash)
-      config = defaults.merge(config)
+        config = symbolize_keys(configuration)
+        config = defaults.merge(config)
 
-      [:host, :port, :size, :automatic_logging, :logger_level].each do |method|
-        send("#{method}=", config.delete(method))
+        [:host, :port, :size, :automatic_logging, :logger_level].each do |method|
+          send("#{method}=", config.delete(method))
+        end
+        self.options = config
       end
-      self.options = config
+    end
+
+    def valid?
+      invalid_host = self.host.nil?
+      invalid_port = self.port.nil?
+      invalid_size = self.size.nil?
+      !(invalid_host || invalid_port || invalid_size)
     end
 
     def automatic_logging?

data/lib/gray_logger/helper_methods.rb

@@ -1,17 +1,13 @@
 module GrayLogger
   module HelperMethods
-    
+
     protected
     def gray_logger_proxy
-      if Rails.version.to_i >= 3
-        env["rack.gray_logger.proxy"]
-      else
-        request.env["rack.gray_logger.proxy"]
-      end
+      ::GrayLogger.proxy
     end
 
     def gray_logger
-      gray_logger_proxy.gray_logger
+      ::GrayLogger.proxy.gray_logger
     end
 
   end

data/lib/gray_logger/logger.rb

@@ -8,8 +8,12 @@ module GrayLogger
     attr_reader :buckets, :configuration
 
     def initialize(configuration)
-      super(configuration.host, configuration.port, configuration.size, configuration.options)
-      @configuration = configuration
+      if configuration.valid?
+        super(configuration.host, configuration.port, configuration.size, configuration.options)
+        @configuration = configuration
+      else
+        self.disable # from GELF
+      end
 
       @buckets = {}
     end

data/lib/gray_logger/proxy.rb

@@ -8,9 +8,7 @@ module GrayLogger
     end
 
     def gray_logger
-      if ::GrayLogger.configuration
-        @gray_logger ||= ::GrayLogger::Logger.new(::GrayLogger.configuration.dup)
-      end
+      @gray_logger ||= ::GrayLogger::Logger.new(::GrayLogger.configuration)
     end
 
     # def debug(*args)

data/lib/gray_logger/rack.rb

@@ -11,7 +11,6 @@ module Rack
       end
 
       def call(env)
-        env["rack.gray_logger.proxy"] = ::GrayLogger.proxy
         gray_logger = ::GrayLogger.proxy.gray_logger
         begin
           gray_logger.reset!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gray_logger
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 11
-  - 4
-  version: 0.11.4
+  - 5
+  version: 0.11.5
 platform: ruby
 authors: 
 - Benjamin Behr