infinum_graylog 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49569ea1e932e8f9252b96592f7e934932311273f799e320be8caea2e25936cf
-  data.tar.gz: 5dac3718045d2ae7542a7285ae226e69cddf04b28e345e40e07dff3505029ee1
+  metadata.gz: 3c45c6c7d40d3f7b1e94bf35cb63e0f351ed1f05bf8f0ba637124747da3a78da
+  data.tar.gz: d05fb525dc2a5366283b5b6b283afc16fbaf21056bd26d727370b2a0797eea2a
 SHA512:
-  metadata.gz: fd5bad3f451ab0dafb635dfd58c0750197803b940360ce12db68b1517d761b0273fbdff351da8c196cb3da293f75bdaf116f92083656ef2e72e8de7a954fd78e
-  data.tar.gz: 14f9c4bf3f901aea6f492adc656cd07e13a3b5bd678c442cdec87375088874574d7a0149e8bbc0c89d60692bb98503d1c41eb34128f94eec1104a6fe2c3e86ff
+  metadata.gz: 7b1706a9b905d35ee7434920dfa64d9b0fc438bd7228d88a3ff37d95505ec2ae74c44610c3ad6e28f8bf65a5b847033337225276c04097b3a57102cd16242fcc
+  data.tar.gz: 2e04061f26cf94800db497ae3f769c1651601217d1b616e5e7a51daebd77d519c9dbee7de6eeb5839ee6ee757f3eb5b69637abaad3a0b31983266a4eebaa4992

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    infinum_graylog (0.1.0)
+    infinum_graylog (0.5.0)
       gelf
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
-    gelf (3.0.0)
+    gelf (3.1.0)
       json
-    json (2.1.0)
+    json (2.2.0)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)

data/infinum_graylog.gemspec

@@ -1,5 +1,4 @@
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'infinum_graylog/version'
 
@@ -23,7 +22,7 @@ Gem::Specification.new do |spec|
       'public gem pushes.'
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = 'exe'

data/lib/infinum_graylog/middleware.rb

@@ -0,0 +1,13 @@
+module InfinumGraylog
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      request = ActionDispatch::Request.new(env)
+      InfinumGraylog::Notifier.request_id = request.request_id
+      @app.call(env)
+    end
+  end
+end

data/lib/infinum_graylog/notifier.rb

@@ -8,26 +8,39 @@ module InfinumGraylog
     end
 
     def notify(payload)
-      @notifier.notify!(payload)
+      payload = payload.merge(request_id: request_id)
+      Thread.new { @notifier.notify!(payload) }.join
+    end
+
+    def thread_key
+      @thread_key ||= "infinum_graylog_notifier:#{object_id}"
     end
 
     def self.notify(payload)
-      return unless payload.present?
+      return if payload.blank?
+
       instance.notify(payload)
     end
 
+    def self.request_id=(request_id)
+      Thread.current[instance.thread_key] = request_id
+    end
+
     private
 
     def options
       {
         protocol: configuration.protocol,
-        level: configuration.level,
+        level: configuration.level
       }.merge(configuration.options)
     end
 
     def configuration
-      InfinumGraylog.configuration
+      @configuration ||= InfinumGraylog.configuration
+    end
+
+    def request_id
+      Thread.current[thread_key] || SecureRandom.hex
     end
   end
 end
-

data/lib/infinum_graylog/process_action_controller.rb

@@ -40,7 +40,7 @@ module InfinumGraylog
       return nil unless event.payload[:headers]
       headers = {}
 
-      event.payload[:headers].each_pair do |key, value|
+      event.payload[:headers].each do |key, value|
         if key.to_s.start_with?("HTTP_")
           header_key = key[5..-1]
         elsif ["CONTENT_TYPE", "CONTENT_LENGTH"].include?(key)

data/lib/infinum_graylog/railtie.rb

@@ -0,0 +1,7 @@
+module InfinumGraylog
+  class Railtie < ::Rails::Railtie
+    initializer 'infinum_graylog.insert_middleware' do |app|
+      app.config.middleware.insert_after ActionDispatch::RequestId, InfinumGraylog::Middleware
+    end
+  end
+end

data/lib/infinum_graylog/subscriber.rb

@@ -1,17 +1,27 @@
 module InfinumGraylog
   class Subscriber
     def self.subscribe
-      unless InfinumGraylog.configuration.skip_environments.include?(Rails.env)
-        ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |*args|
-          event = ActiveSupport::Notifications::Event.new(*args)
-          Notifier.notify(ProcessActionController.new(event).format)
-        end
+      return unless tls_and_files_exist?
+      return if InfinumGraylog.configuration.skip_environments.include?(Rails.env)
 
-        ActiveSupport::Notifications.subscribe 'sql.active_record' do |*args|
-          event = ActiveSupport::Notifications::Event.new(*args)
-          Notifier.notify(SqlActiveRecord.new(event).format)
-        end
+      puts '[InfinumGraylog] notifications configured'
+
+      ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+        Notifier.notify(ProcessActionController.new(event).format)
+      end
+
+      ActiveSupport::Notifications.subscribe 'sql.active_record' do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+        Notifier.notify(SqlActiveRecord.new(event).format)
       end
     end
+
+    def self.tls_and_files_exist?
+      tls_configuration = InfinumGraylog.configuration.options[:tls]
+
+      tls_configuration.present? &&
+        File.exist?(tls_configuration[:cert]) && File.exist?(tls_configuration[:key])
+    end
   end
 end

data/lib/infinum_graylog/version.rb

@@ -1,3 +1,3 @@
 module InfinumGraylog
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/infinum_graylog.rb

@@ -6,6 +6,8 @@ require 'infinum_graylog/process_action_controller'
 require 'infinum_graylog/sql_active_record'
 require 'infinum_graylog/notifier'
 require 'infinum_graylog/subscriber'
+require 'infinum_graylog/middleware'
+require 'infinum_graylog/railtie' if defined?(Rails::Railtie)
 
 module InfinumGraylog
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infinum_graylog
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Stjepan Hadjic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,8 +88,10 @@ files:
 - lib/infinum_graylog.rb
 - lib/infinum_graylog/cleaner.rb
 - lib/infinum_graylog/configuration.rb
+- lib/infinum_graylog/middleware.rb
 - lib/infinum_graylog/notifier.rb
 - lib/infinum_graylog/process_action_controller.rb
+- lib/infinum_graylog/railtie.rb
 - lib/infinum_graylog/sql_active_record.rb
 - lib/infinum_graylog/subscriber.rb
 - lib/infinum_graylog/version.rb
@@ -114,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: summary