sidekiq-logstash 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc38ad2cc3d3ab1442c7fcc247de86debb2efee350fb79ab338be8c1312b4a74
-  data.tar.gz: b7e673004684db2cb65fe995ec0af50e3aca86d5798a60e3155b49a2017a3233
+  metadata.gz: 8741a0305b66c67b87d9605f985d1a134c4a2c241d0574981d1c02d2fe53c8d1
+  data.tar.gz: 71b28ada1b667ec07106ae8fc7cbf6f58e11e98f4511e871aedcfd738cc5e5b0
 SHA512:
-  metadata.gz: 25487c554f1a12378466c11f3989ac6e1ee99a94d5122b8d47bcc48c407ade6e19100b9b83243fbaf231a48bbbe1e49115db64d81e850ede262819e5cb3d3665
-  data.tar.gz: '090083e3791e5c80cce26d3cd63fc6afcffdf756e55451d4baab55eea3acb2da871d75ed5ee30bb1eea64900285a5ff9a18c66db7a71072a517da30061c8fcc1'
+  metadata.gz: d7c9c68c569d60e5462b7b9b152dd68518e634788556ace9208c68503ca7222459aa21934490fd3e54a52d719ac5e4dada5737f29b42f3a7a7ad4b1b01cbdeda
+  data.tar.gz: cb1e05479b3dc5918b8bc8b1ed1f93bc0b4ea822c8d00d4fd8de4a14321618665494b581c44eed50f54b83405d7751a26973f181b6e3a744f7e747822375fae7

data/.travis.yml

@@ -1,11 +1,20 @@
 language: ruby
 rvm:
-  - 2.2.2
-  - 2.3.0
-  - 2.4.0
+- 2.2.2
+- 2.3.0
+- 2.4.0
 before_install: gem install bundler -v 1.11.2
-
 gemfile:
-  - gemfiles/sidekiq3.gemfile
-  - gemfiles/sidekiq4.gemfile
-  - gemfiles/sidekiq5.gemfile
+- gemfiles/sidekiq3.gemfile
+- gemfiles/sidekiq4.gemfile
+- gemfiles/sidekiq5.gemfile
+deploy:
+  provider: rubygems
+  api_key:
+    secure: HQ8O6JFLXqs91LFfAkwQyk3NGJ6EAvTrlS1IHGZrU8qHz+4or7VQJEAtwhimy7Za2Kylhr5t1oIK/D+9Ko8YmSZzVKtFoMwQLEQizNjt1zmkcrVsGVBewm8Dp6e9eEceYap0zm/LSMRog7ePicDUbkfg3eoZxuWPSd3L5AuQ73VydDL9WFTiv1ilCdx+DQAZ5D7NjfP6//FlP3QHHAu+SLj1vz3ejB6FgJndrKB45FEYnKH0J0jcnuTHjcrHxURmzot1+MSi322bLdQLY/I1t7GAdyGEvv+5GdCZn8PyCbK9Z3YktBXMGG/oILxhoUvTrWbrJzce6TlijywekXUU3uljJOW7gvLAYDaHSKO249YyvvjZrFwbqaBS+SFFRfeNnYOkiZjQAN+3t4QHLd4OOTPMiUagIAJqjrMwS56HQxoPUz+4gJ0mTvMG9VO1WZgbDyFqYyoiQZbtOoc8p4uDdhq3pbDR2cA4PfVOLGDDrkaKb5rqzrjuDfWNleTgIst2ON+xfMJy/uvvBLvcWAkYLwNNvhJn2tn01Zuaj+DMzk5+KU6tSmtSgfvAh/DmTHZDrMKuyGDgSUomicAbUVR9U6/+r4EHMuwvXs2UpSH+0oIxxJIdjb2T55yAid2XrI3fbzvnoReT21UkPWAnrjlUXZ/XFfjCrhS+NxNjZOUMuns=
+  gem: sidekiq-logstash
+  on:
+    tags: true
+    repo: iMacTia/sidekiq-logstash
+    rvm: 2.4.0
+

data/lib/sidekiq/logging/logstash_formatter.rb

@@ -4,13 +4,12 @@ module Sidekiq
   module Logging
     class LogstashFormatter
       def call(severity, time, progname, data)
+        json_data = { severity: severity }
+
         if data.is_a? Hash
-          json_data = data
+          json_data.merge!(data)
         else
-          json_data = {
-              severity: severity,
-              message:  data
-          }
+          json_data[:message] = data
         end
 
         # Merge custom_options to provide customization

data/lib/sidekiq/logstash/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Logstash
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/sidekiq-logstash.gemspec

@@ -27,5 +27,6 @@ DESC
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-json_expectations', '~> 2.1.0'
   spec.add_development_dependency 'factory_girl', '~> 4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-logstash
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mattia Giuffrida
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -86,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-json_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -152,8 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Logstash plugin for Sidekiq