logist 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89bc1e23d5c8e20fc4ab77eb5c195013da0ae18e
-  data.tar.gz: 8c549ad528ec961a5420c4bb0406d543bf015391
+SHA256:
+  metadata.gz: 6e6ad3e32e005fb5cd93ab69c54a65cda28d6c39339084d0d85ab0d506478cb8
+  data.tar.gz: fba3d6f1f25d24836fbe8bc63d0e45f7061001144b4b9b472898cda2dfc3e4ca
 SHA512:
-  metadata.gz: 8e03a2c4128740077ffc4b0f10bf72fc10df8b01d2b82b536389db2d0a1f5045249be351b984fb08df2eee3a4a2cd73475104965349379f814332c5c1179a24d
-  data.tar.gz: 0cd0002275fe6086b0207e7e712248fb969139cf9d7c0c157855f77039da68348f7f606696fdbae4ab43353fbbc6dee9f99fe965d512b431e755e82dce7c6877
+  metadata.gz: 1d9c68a45b69f8a44f3416359582d60a3ad3b7cc6c2e801f76d9f3b5712a2afa40440d9220da527abfe8fa9582fcf810e4b2f6a01ee96bdf48925007e219b299
+  data.tar.gz: fbb266f39ea4f7175e1a55a683092944885a15152ad13bc790dfd3572140cb068f149fefee7814859547dbf93382347d0be660eb0321bb8e077cf7e6deb972e6

data/.travis.yml

@@ -1,12 +1,16 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1.10
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
 before_install: gem install bundler -v 1.15.4
 install: bundle install --jobs=3 --retry=3 --path=vendor/bundle
 cache:
   directories: vendor/bundle
 script: bundle exec rspec spec
+notifications:
+  email: false
+

data/README.md

@@ -1,5 +1,7 @@
 # Logist
-[![Build Status](https://travis-ci.org/h3poteto/logist.svg?branch=travis)](https://travis-ci.org/h3poteto/logist)
+[![Build Status](https://travis-ci.com/h3poteto/logist.svg?branch=master)](https://travis-ci.com/h3poteto/logist)
+[![Gem Version](https://badge.fury.io/rb/logist.svg)](https://badge.fury.io/rb/logist)
+[![GitHub release](https://img.shields.io/github/release/h3poteto/logist.svg)](https://github.com/h3poteto/logist/releases)
 
 This gem provides json format for logger in Rails. Logist output json log like this:
 
@@ -64,6 +66,25 @@ Rails.application.configure do
 end
 ```
 
+### flat_json option
+
+If you want to log Hash object, but you don't want to have nested JSON, you can set `flat_json=true`:
+
+```ruby
+config.logger.formatter.flat_json = true
+```
+
+When `flat_json=false` (default):
+
+```json
+{"level":"INFO","message":{"foo":"bar"}}
+```
+
+When `flat_json=true`:
+
+```json
+{"level":"INFO","foo":"bar"}
+```
 
 
 ## Development

data/lib/logist/formatter/json.rb

@@ -5,14 +5,29 @@ require 'rails'
 module Logist
   module Formatter
     class Json < ::Logger::Formatter
-      def call(severity, timestamp, progname, msg)
-        begin
-          j = ::JSON.parse(msg)
-          temp = {level: severity, timestamp: format_datetime(timestamp), environment: ::Rails.env}.merge(j)
-          ::JSON.dump(temp) + "\n"
-        rescue JSON::ParserError
-          "{\"level\":\"#{severity}\",\"timestamp\":\"#{format_datetime(timestamp)}\",\"message\":\"#{msg}\",\"environment\":\"#{::Rails.env}\"}\n"
+      attr_accessor :flat_json
+
+      def call(severity, timestamp, progname, raw_msg)
+        msg = normalize_message(raw_msg)
+        payload = { level: severity, timestamp: format_datetime(timestamp), environment: ::Rails.env }
+
+        if flat_json && msg.is_a?(Hash)
+          payload.merge!(msg)
+        else
+          payload.merge!(message: msg)
         end
+
+        payload.to_json << "\n"
+      end
+
+      private
+
+      def normalize_message(raw_msg)
+        return raw_msg unless raw_msg.is_a?(String)
+
+        JSON.parse(raw_msg)
+      rescue JSON::ParserError
+        raw_msg
       end
     end
   end

data/lib/logist/logger.rb

@@ -1,16 +1,38 @@
+require 'active_support/logger_silence'
+require 'active_support/logger_thread_safe_level'
+require 'logger'
+
 module Logist
   class Logger < ::Logger
+    include ActiveSupport::LoggerThreadSafeLevel
+
+    # https://github.com/rails/rails/pull/34045
+    if defined?(ActiveSupport::LoggerSilence)
+      include ActiveSupport::LoggerSilence
+    else
+      include LoggerSilence
+    end
+
     def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
-                   progname: nil, formatter: nil, datetime_format: nil,
+                   progname: nil, formatter: nil, datetime_format: nil, flat_json: false,
                    shift_period_suffix: '%Y%m%d')
       # I think that Logist should support other formats in the future.
       # But, as it is now, Logist only support json format.
       # So this line force json format all environments.
       @formatter = Logist::Formatter::Json.new
       @formatter.datetime_format = datetime_format
+      @formatter.flat_json = flat_json
       super(logdev, shift_age, shift_size, level: level,
             progname: progname, formatter: @formatter, datetime_format: datetime_format,
             shift_period_suffix: shift_period_suffix)
+
+      # https://github.com/rails/rails/pull/34055
+      # even with ^ respond_to?(:after_initialize) is still true
+      # but we know not to run it if ActiveSupport::LoggerSilence is defined, since that was added in the same rails version
+      # via https://github.com/rails/rails/pull/34045
+      if !defined?(ActiveSupport::LoggerSilence) && respond_to?(:after_initialize)
+        after_initialize
+      end
     end
   end
 end

data/lib/logist/version.rb

@@ -1,3 +1,3 @@
 module Logist
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/logist.gemspec

@@ -30,11 +30,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_runtime_dependency "json", ">= 1.8"
   spec.add_runtime_dependency "railties", ">= 4"
+  spec.add_runtime_dependency "activesupport", ">= 4.2"
   spec.add_runtime_dependency "lograge", ">= 0.7", "< 1.0"
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logist
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - AkiraFukushima
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: lograge
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,9 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Change log format to json in Rails.
 test_files: []