xyeger 0.2.5 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3150af17290987d039118dc67a90951341f23e87
-  data.tar.gz: 34c6b9e38a4ba8a7e5f7ab97d50c2d3e5344bb8b
+  metadata.gz: ba329941a18fb032f5e48dedb05b239dfd3c8b12
+  data.tar.gz: 73a0b14046df768f08b3369b523fea7ec9220e8c
 SHA512:
-  metadata.gz: a2c727284665e027396d4af769be42a81787fc4886ca58149a2f3c92c8cb99afe5b8e57cf78538f4f02a57c72812dc4694eda55de4e63a433cd0b60acd93be4f
-  data.tar.gz: 71f2404cd76e694abea476ff7967038c1618f98ba56d0c1ea8d5d1ed6cf270ac41cd1a53134d101f5744f89ca5c985a37830d0065b0052a3c4cb43efeff29fdc
+  metadata.gz: 7f55e3dd8eadf798fca7c0e51c92233a6b23edf2b18a33732cef3cbdccd3ae32fd9bdabeeac1c19bc20ac39130db03c7c9f7bb8e1a2ec65f28d174d3ee92526d
+  data.tar.gz: aad11efb3f243032ad7eea12478cd43e55e91fe200090e17a0169144c0575ecc5d578b533feacbf70c80ae9f069131bcf712a3e9f0732b562eb2722401df8156

data/README.md

@@ -164,20 +164,11 @@ end
 
 ## Sidekiq usage
 
-```ruby
-# config/initializers/sidekiq.rb
-Sidekiq::Logging.logger = Xyeger::Logger.new(STDOUT)
-Sidekiq::Logging.logger.formatter = Xyeger::Formatters::SidekiqJson.new
-```
-
-## ActiveRecord usage
-
 ```ruby
 # config/initializers/xyeger.rb
-ActiveRecord::Base.logger = Rails.logger
+Sidekiq::Logging.logger.formatter = Xyeger::Formatters::SidekiqJson.new
 ```
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/xyeger/formatters/base.rb

@@ -22,7 +22,6 @@ module Xyeger
           env: Xyeger.config.env,
           level: severity,
           time: timestamp,
-          caller: caller_message(caller_locations),
           message: message,
           context: context
         }
@@ -32,12 +31,6 @@ module Xyeger
         result
       end
 
-      private def caller_message(callers)
-        if location = callers.find{|x| x.path.include?(Rails.root.to_s)}
-          "#{location.path}:#{location.lineno}"
-        end
-      end
-
       private def prepare(message, context)
         message = uncolorize(message) unless attributes[:colored]
 
@@ -69,7 +62,7 @@ module Xyeger
       end
 
       def uncolorize(message)
-        message.gsub(UNCOLORIZE_REGEXP, '')
+        message.to_s.gsub(UNCOLORIZE_REGEXP, '')
       end
     end
   end

data/lib/xyeger/logger.rb

@@ -1,6 +1,10 @@
 module Xyeger
-  class Logger < ActiveSupport::Logger
-    Logger::Severity.constants.each do |severity|
+  module Logger
+    def self.extended(base)
+      base.formatter = Xyeger.config.formatter if Xyeger.config
+    end
+
+    ActiveSupport::Logger::Severity.constants.each do |severity|
       define_method severity.downcase do |message=nil, context=nil, &block|
         context, message = message, context if message.is_a?(Hash)
 
@@ -13,7 +17,7 @@ module Xyeger
             message = result
           end
         end
-        add(Logger::Severity.const_get(severity), message, context)
+        add(ActiveSupport::Logger::Severity.const_get(severity), message, context)
       end
     end
   end

data/lib/xyeger/version.rb

@@ -1,3 +1,3 @@
 module Xyeger
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/lib/xyeger.rb

@@ -33,11 +33,7 @@ module Xyeger
     app = Rails.application
     setup_lograge(app)
 
-    app.config.logger = Logger.new(config.output)
-    log_level = Rails.logger.level
-    Rails.logger = app.config.logger
-    Rails.logger.formatter = config.formatter
-    Rails.logger.level = log_level
+    Rails.logger.extend(Logger)
   end
 
   def setup_lograge(app)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xyeger
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.1
 platform: ruby
 authors:
 - Avramov Vsevolod