gray_logger 0.11.0 → 0.11.1

data/lib/gray_logger.rb

@@ -1,6 +1,8 @@
 require 'gelf'
 
 require 'gray_logger/support'
+require 'gray_logger/proxy'
+require 'gray_logger/configuration'
 require 'gray_logger/bucket'
 require 'gray_logger/message'
 require 'gray_logger/logger'
@@ -11,3 +13,20 @@ if defined?(Rails)
   require 'gray_logger/rails_modules'
   require 'gray_logger/railtie' if defined?(Rails::Railtie)
 end
+
+module GrayLogger
+
+  class << self
+    attr_accessor :configuration
+  end
+
+  # GrayLogger.configure({:host => '127.0.0.1'}) do |config|
+  #   config.port = "11200"
+  # end
+  def self.configure(config)
+    self.configuration = ::GrayLogger::Configuration.new(config)
+    yield(configuration) if block_given?
+  end
+
+end
+

data/lib/gray_logger/configuration.rb

@@ -0,0 +1,26 @@
+module GrayLogger
+  class Configuration
+    include ::GrayLogger::Support
+
+    attr_accessor :host, :port, :size, :automatic_logging, :options
+    def initialize(configuration_hash)
+      defaults = {
+        :size => "WAN",
+        :facility => "facility-not-defined"
+      }
+
+      config = symbolize_keys(configuration_hash)
+      config = defaults.merge(config)
+
+      [:host, :port, :size, :automatic_logging].each do |method|
+        send("#{method}=", config.delete(method))
+      end
+      self.options = config
+    end
+
+    def automatic_logging?
+      @automatic_logging.nil? ? true : !!@automatic_logging
+    end
+
+  end
+end

data/lib/gray_logger/helper_methods.rb

@@ -1,8 +1,18 @@
 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
+    end
+
     def gray_logger
-      Rack::GrayLogger.proxy.gray_logger
+      gray_logger_proxy.gray_logger
     end
-    protected :gray_logger
+
   end
 end

data/lib/gray_logger/logger.rb

@@ -2,34 +2,24 @@ module GrayLogger
 
   class Logger < GELF::Logger
     include ::GrayLogger::Support
-    attr_reader :buckets, :automatic_logging
+    attr_reader :buckets, :configuration
 
-    def initialize(configuration={})
-      automatic_logging = configuration.delete(:automatic_logging)
-      @automatic_logging = automatic_logging.nil? ? true : automatic_logging
-
-      defaults = {
-        :size => "WAN",
-        :facility => "facility-not-defined"
-      }
-
-      config = symbolize_keys(configuration)
-      config = defaults.merge(config)
-
-      super(config.delete(:host), config.delete(:port), config.delete(:size), config)
+    def initialize(configuration)
+      super(configuration.host, configuration.port, configuration.size, configuration.options)
+      @configuration = configuration
 
       @buckets = {}
     end
 
-    def automatic_logging?
-      !!@automatic_logging
-    end
-
     def reset!
       @buckets = {}
       self
     end
 
+    def automatic_logging?
+      configuration.automatic_logging?
+    end
+
     # logger.after_request_log << {:my_field => 'field content'}
     # logger.after_request_log.my_field = 'field content'
     def after_request_log

data/lib/gray_logger/proxy.rb

@@ -0,0 +1,51 @@
+module GrayLogger
+  class Proxy
+    attr_accessor :proxied_logger, :gray_logger
+
+    def initialize(attributes={})
+      self.proxied_logger = attributes[:proxied_logger]
+      self.gray_logger = attributes[:gray_logger]
+    end
+
+    # def debug(*args)
+    #   if proxied_logger.nil?
+    #     gray_logger.send(:debug, *args)
+    #   else
+    #     after_request_log.append_to(:log_file, "[debug] #{args[0]}") unless gray_logger.nil?
+    #     proxied_logger.send(:debug, *args)
+    #   end
+    # end
+    GELF::Levels.constants.each do |const|
+      class_eval <<-EOT, __FILE__, __LINE__ + 1
+        def #{const.downcase}(*args)
+          if proxied_logger.nil?
+            gray_logger.send(:#{const.downcase}, *args)
+          else
+            gray_logger.after_request_log.append_to(:log_file, "[#{const.downcase}] \#{args[0]}") unless gray_logger.nil?
+            proxied_logger.send(:#{const.downcase}, *args)
+          end
+        end
+      EOT
+    end
+
+    private
+    # delegate every method the proxy doesn't know to gray_logger and proxied_logger. let them handle this.
+    def method_missing(method_name, *args, &block)
+      unless proxied_logger.nil?
+        begin
+          proxied_logger.send(method_name, *args, &block)
+        rescue => e
+          proxied_logger.error(e.backtrace.join("\n"))
+        end
+      end
+    end
+  end
+
+  def self.proxy= proxy
+    @proxy = proxy
+  end
+
+  def self.proxy
+    @proxy ||= ::GrayLogger::Proxy.new
+  end
+end

data/lib/gray_logger/rack.rb

@@ -1,21 +1,19 @@
 module Rack
   module GrayLogger
+
     class Middleware
       include ::GrayLogger::Support
 
       attr_accessor :gray_logger
 
-      def initialize(app, options={})
+      def initialize(app)
         @app = app
-
-        configuration = symbolize_keys(options.delete(:configuration))
-        self.gray_logger = ::GrayLogger::Logger.new(configuration)
-
-        ::Rack::GrayLogger.proxy.gray_logger = gray_logger
+        ::GrayLogger.proxy.gray_logger = ::GrayLogger::Logger.new(::GrayLogger.configuration.dup)
       end
 
       def call(env)
-
+        env["rack.gray_logger.proxy"] = ::GrayLogger.proxy
+        gray_logger = ::GrayLogger.proxy.gray_logger
         begin
           status, headers, body = @app.call(env)
         rescue => e
@@ -23,7 +21,7 @@ module Rack
           raise
         ensure
           req = Rack::Request.new(env)
-          if gray_logger.automatic_logging?
+          if ::GrayLogger.configuration.automatic_logging?
             gray_logger.log_exception(env['rack.exception'])
             gray_logger.after_request_log.status_code = status.to_i
             gray_logger.after_request_log.short_message = "Request: #{req.path} (#{status.to_i})" if gray_logger.after_request_log[:short_message].nil?
@@ -38,61 +36,5 @@ module Rack
 
     end
 
-    class Proxy
-      attr_accessor :proxied_logger, :gray_logger
-
-      def initialize(attributes={})
-        self.proxied_logger = attributes[:proxied_logger]
-        self.gray_logger = attributes[:gray_logger]
-      end
-
-      # def debug(*args)
-      #   if proxied_logger.nil?
-      #     super(*args)
-      #   else
-      #     after_request_log.append_to(:log_file, "[debug] #{args[0]}") unless gray_logger.nil?
-      #     proxied_logger.send(:debug, *args)
-      #   end
-      # end
-      GELF::Levels.constants.each do |const|
-        class_eval <<-EOT, __FILE__, __LINE__ + 1
-          def #{const.downcase}(*args)
-            if proxied_logger.nil?
-              gray_logger.send(:#{const.downcase}, *args)
-            else
-              gray_logger.after_request_log.append_to(:log_file, "[#{const.downcase}] \#{args[0]}") unless gray_logger.nil?
-              proxied_logger.send(:#{const.downcase}, *args)
-            end
-          end
-        EOT
-      end
-
-      private
-      def method_missing(method_name, *args, &block)
-        unless gray_logger.nil?
-          begin
-            gray_logger.send(method_name, *args, &block)
-          rescue => e
-            gray_logger.handle_exception(e)
-          end
-        end
-        unless proxied_logger.nil?
-          begin
-            proxied_logger.send(method_name, *args, &block)
-          rescue => e
-            proxied_logger.error(e.backtrace.join("\n"))
-          end
-        end
-      end
-    end
-
-    def self.proxy= proxy
-      @proxy = proxy
-    end
-
-    def self.proxy
-      @proxy ||= ::Rack::GrayLogger::Proxy.new
-    end
-
   end
 end

data/lib/gray_logger/railtie.rb

@@ -5,7 +5,8 @@ module GrayLogger
     begin
       initializer "gray_logger.configure_rails_initialization" do |app|
         configuration = YAML.load(File.read(Rails.root.join('config/gray_logger.yml')))[Rails.env]
-        app.middleware.insert_after "ActionDispatch::ShowExceptions", "Rack::GrayLogger::Middleware", :configuration => configuration
+        ::GrayLogger.configure(configuration)
+        app.middleware.insert_after "ActionDispatch::ShowExceptions", "Rack::GrayLogger::Middleware"
       end
     rescue => e
       $stderr.puts("GrayLogger not configured. Please add config/gray_logger.yml")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gray_logger
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - Benjamin Behr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-16 00:00:00 Z
+date: 2012-11-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gelf
@@ -41,9 +41,11 @@ extra_rdoc_files: []
 
 files: 
 - lib/gray_logger/bucket.rb
+- lib/gray_logger/configuration.rb
 - lib/gray_logger/helper_methods.rb
 - lib/gray_logger/logger.rb
 - lib/gray_logger/message.rb
+- lib/gray_logger/proxy.rb
 - lib/gray_logger/rack.rb
 - lib/gray_logger/rails_modules.rb
 - lib/gray_logger/railtie.rb