xyeger 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6fd8d7c1c20bb9ad7c4dc82ef8520dee72ba414
-  data.tar.gz: b332c76dca53975e4aac6a237ef0b3c07fcc3b5a
+  metadata.gz: de37530451f05be5081c3cd4e4a1c9e90e15c708
+  data.tar.gz: 847aa6cda3576580ee4de086055221f4f8078202
 SHA512:
-  metadata.gz: 02c6f7aa84b8a72ea2f2dc9fcc140cc86c3f053e1ef803ca8f8a9c0d293184a35b4e7565d595080b8a17c0652cbf3c49e5d01b1e5be91f9cb7b9fa2eca853682
-  data.tar.gz: f6a41e97e0a35025f52913ab8e13dfa0bc248f591222795bc4b8d4cecf9ddf82f79486c8411a3ce93430d207b6f06057d4a4d64255c2cff7243ebc28c9f35a53
+  metadata.gz: bffc160214c0fcf04795ace638ea1cd0ea33e2675c1f4388970ad1285db47179e5cdd37c5f31b207fa2818809ace48289ab00e37cf00b057d53de986cc850c84
+  data.tar.gz: b41c880563574eadf1523ba98779dbbbabbb82b864550001b01ec17c7f6bebf6ca0b8337088a3dfa51037154562e666b9738187604310ff8bdb8e4af4de07ccb

data/.gitignore

@@ -1,2 +1,3 @@
 .rspec
 .travis.yml
+.rspec_status

data/lib/xyeger/formatters/base.rb

@@ -11,7 +11,7 @@ module Xyeger
       def call(severity, timestamp, context, message)
         message, context = prepare(message, context)
 
-        context = Xyeger.config.filter.filter(context) if Xyeger.config.filter
+        context = filter_context(context)
 
         result = {
           hostname: Xyeger.config.hostname,
@@ -57,6 +57,12 @@ module Xyeger
           result[key] = Paint[value, colors[index]]
         end
       end
+
+      private def filter_context(context)
+        return context unless Xyeger.config.filter && context.is_a?(Hash)
+
+        Xyeger.config.filter.filter(context)
+      end
     end
   end
 end

data/lib/xyeger/formatters/sidekiq_json.rb

@@ -0,0 +1,27 @@
+module Xyeger
+  module Formatters
+    class SidekiqJson < Base
+      def call(severity, timestamp, context, message)
+        context, message = prepare_message(message) unless context
+
+        super(severity, timestamp, context, message).merge(
+          pid: ::Process.pid,
+          tid: "TID-#{Thread.current.object_id.to_s(36)}",
+          sidekiq_context: sidekiq_context
+        ).to_json + "\n"
+      end
+
+      def sidekiq_context
+        c = Thread.current[:sidekiq_context]
+        c.join(' ') if c&.any?
+      end
+
+      def prepare_message(message)
+        json = JSON.parse(message)
+        [filter_context(json), 'Sidekiq']
+      rescue JSON::ParserError => e
+        [nil, message]
+      end
+    end
+  end
+end

data/lib/xyeger/formatters.rb

@@ -6,5 +6,6 @@ module Xyeger
     autoload :Json
     autoload :Values
     autoload :LogrageRaw
+    autoload :SidekiqJson
   end
 end

data/lib/xyeger/logger.rb

@@ -1,7 +1,18 @@
 module Xyeger
   class Logger < ActiveSupport::Logger
     Logger::Severity.constants.each do |severity|
-      define_method "#{severity.downcase}" do |message, context={}|
+      define_method severity.downcase do |message=nil, context=nil, &block|
+        context, message = message, context if message.is_a?(Hash)
+
+        if block
+          result = block.call
+
+          if result.is_a?(Hash)
+            context = result
+          else
+            message = result
+          end
+        end
         add(Logger::Severity.const_get(severity), message, context)
       end
     end

data/lib/xyeger/version.rb

@@ -1,3 +1,3 @@
 module Xyeger
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/xyeger.gemspec

@@ -41,4 +41,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'rubocop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xyeger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Avramov Vsevolod
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lograge
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Uniq logger for project
 email:
 - vsevolod@cryptopay.me
@@ -144,6 +158,7 @@ files:
 - lib/xyeger/formatters/json.rb
 - lib/xyeger/formatters/key_value.rb
 - lib/xyeger/formatters/lograge_raw.rb
+- lib/xyeger/formatters/sidekiq_json.rb
 - lib/xyeger/formatters/values.rb
 - lib/xyeger/logger.rb
 - lib/xyeger/version.rb