loggery 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a3267ee8ed1a0024f4c0678e68966a9d13ad84cb
-  data.tar.gz: 4ea72bd362f057dc81c1b5b858bb9871b82d4347
+SHA256:
+  metadata.gz: b3f02b4ee50f2e942444925c0278c5f18e9cfdc0e38594102570055a4d6ddf75
+  data.tar.gz: '0733840f78c3d3bc32a2e6cb5c5cf8109716bdd608793978b6f67a2cef0c4c57'
 SHA512:
-  metadata.gz: 47d0718b91ddc4d108cbc2fa4572b856c50bdb1edd13ab4c2554e228ceeeb3a9b9dbab01df0661beee87905ecf8e0e8ffaaa74280342b9615006b7c06259feaf
-  data.tar.gz: 9f1a353afaf04ba2827214b73f7b08d6d3c8203fc5ea015a6170e3892a1d7187fb419e4e3b1b54406acaac95d8e32ddb15fe48077810acd92c4eea5311c73999
+  metadata.gz: d87cca82b3c6ee57708e31f58abb608378e136537d71f945650d5fcd2ab289f1e469f8fedbedf39941f9b08b5408dbe8aab8db9923704771f928cf5bc2bb7a9b
+  data.tar.gz: 72d8d29e17a52316df6b1059eeddea1fb39b0236beacc60917e5a8416b524c809ec690be95857f4643a29bddca09578884717262b3f51cc4fefdfe4b0f2337cf

data/.gitignore

@@ -7,6 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/spec/tmp/
 
 log
 

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes

data/.travis.yml

@@ -1,16 +1,13 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.2
+  - 2.5.6
+  - 2.6.4
 gemfile:
-  - gemfiles/rails4.2.gemfile
-  - gemfiles/rails5.0.gemfile
-  - gemfiles/rails5.1.gemfile
   - gemfiles/rails5.2.gemfile
+  - gemfiles/rails6.0.gemfile
 before_install:
   - rvm use @global
-  - gem uninstall bundler -x
-  - gem install -v 1.17.2 bundler --no-rdoc --no-ri
-script:  
+script:
 - bundle exec rubocop
 - bundle exec rspec

data/Appraisals

@@ -1,17 +1,9 @@
 # frozen_string_literal: true
 
-appraise "rails4.2" do
-  gem "rails", "~> 4.2.0"
-end
-
-appraise "rails5.0" do
-  gem "rails", "~> 5.0.0"
-end
-
-appraise "rails5.1" do
-  gem "rails", "~> 5.1.0"
+appraise "rails5.2" do
+  gem "rails", "~>5.2.0"
 end
 
-appraise "rails5.2" do
-  gem "rails", "5.2.0.beta2"
+appraise "rails6.0" do
+  gem "rails", "~>6.0.0"
 end

data/Changes.md

@@ -0,0 +1,6 @@
+# Loggery Changes
+
+0.3.0
+---------
+
+Support Sidekiq 6

data/README.md

@@ -25,7 +25,7 @@ And then execute:
 
 ### Basic Rails integration
 
-To enable, add 
+To enable, add
 
 ```ruby
 config.loggery.enabled = true
@@ -85,8 +85,8 @@ your `ApplicationController`:
 include Loggery::Controller::LoggingContext
 
 def loggery_log_context
-  { 
-    user_id: current_user&.id, 
+  {
+    user_id: current_user&.id,
     user_email: current_user&.email
   }
 end
@@ -98,7 +98,7 @@ would like to add to your log records.
 
 ### Sidekiq
 
-If you're using Sidekiq you can enable structured logging in sidekiq by adding these lines to 
+If you're using Sidekiq you can enable structured logging in sidekiq by adding these lines to
 `config/initializers/sidekiq.rb`:
 
 ```ruby

data/gemfiles/rails5.2.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.0.beta2"
+gem "rails", "5.2.0"
 
 gemspec path: "../"

data/gemfiles/{rails4.2.gemfile → rails6.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
+gem "rails", "6.0.0"
 
 gemspec path: "../"

data/lib/loggery/gem/version.rb

@@ -2,6 +2,6 @@
 
 module Loggery
   module Gem
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

data/lib/loggery/metadata/middleware/sidekiq.rb

@@ -19,14 +19,12 @@ module Loggery
             log_job_start(message, job_instance_name)
 
             log_job_runtime(:sidekiq_job, job_instance_name) do
-              begin
-                yield
-              rescue StandardError => e
-                # Log exceptions here, otherwise they won't have the metadata available anymore by
-                # the time they reach the Sidekiq default error handler.
-                self.class.error_handler&.call(e)
-                raise e
-              end
+              yield
+            rescue StandardError => e
+              # Log exceptions here, otherwise they won't have the metadata available anymore by
+              # the time they reach the Sidekiq default error handler.
+              self.class.error_handler&.call(e)
+              raise e
             end
           end
         end

data/lib/loggery/sidekiq/setup.rb

@@ -4,9 +4,9 @@ module Loggery
   module Sidekiq
     module Setup
       def self.setup
-        ::Sidekiq::Logging.logger = Rails.logger
-
         ::Sidekiq.configure_server do |config|
+          config.logger = Rails.logger
+
           config.server_middleware do |chain|
             chain.add Loggery::Metadata::Middleware::Sidekiq
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loggery
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Simon Stemplinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -233,15 +233,14 @@ files:
 - ".travis.yml"
 - Appraisals
 - CODE_OF_CONDUCT.md
+- Changes.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - gemfiles/.bundle/config
-- gemfiles/rails4.2.gemfile
-- gemfiles/rails5.0.gemfile
-- gemfiles/rails5.1.gemfile
 - gemfiles/rails5.2.gemfile
+- gemfiles/rails6.0.gemfile
 - lib/loggery.rb
 - lib/loggery/controller/logging_context.rb
 - lib/loggery/gem/version.rb
@@ -274,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Generate logstash compatible log output from Rails apps.

data/gemfiles/rails5.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0.0"
-
-gemspec path: "../"

data/gemfiles/rails5.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.1.0"
-
-gemspec path: "../"