infinum_graylog 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd3974c9af698630454fef034332ec3851bf460aa6a98014f96ac9e0e164438
-  data.tar.gz: f9dee339d8a0b766d25184afda91da31e6961cef73fac7236249951f640e741c
+  metadata.gz: 81a3c58f41536dccc43cee75b025a0e2467758e07f44a3f72c95bbe3940a9990
+  data.tar.gz: d05c00cc929e217fd76123242a8ade13bb7243a0d91f88dbc512b0d7aa05a3f1
 SHA512:
-  metadata.gz: cfdb78496a6182e745d47d7529f3d47a0060ad831be8b20ed41f1c33b9654d1553f7aab3429ef922b274a72cc41527515f0ae3d335136280400a9f37bd11d61f
-  data.tar.gz: c8789dacdbcc2439f05343a0a205f3b6bab0a239aca517a2a20047745e438f4f61947bb6b8f39528b306abf122035ec5962e3e44e60b316d1a9c332ea70143ed
+  metadata.gz: 7ed1ffb3b0ffc883cb41b13cc08a89ca9a8b1b927c785715684bad99cffb700916c5b1963310f161158f3d48c43453c73afe49c3586ef157282e79d7fd13d374
+  data.tar.gz: 7e9a738c6d5ed76ebdd88c239762786c9d7f1bc6881707a3daf18fa10fab058e7b5ca437907fd5b9280a02de22b69c736a7b87e79a21695c53aef7730ea7191f

data/lib/infinum_graylog/configuration.rb

@@ -8,6 +8,15 @@ module InfinumGraylog
     yield(configuration)
   end
 
+  def self.can_subscribe?
+    return false if configuration.skip_environments.include?(Rails.env)
+
+    tls_configuration = configuration.options[:tls]
+
+    tls_configuration.present? &&
+      File.exist?(tls_configuration['cert']) && File.exist?(tls_configuration['key'])
+  end
+
   class Configuration
     attr_accessor :application, :protocol, :level, :options, :host, :port, :skip_environments
     attr_accessor :skip_statuses, :skippable_sql_actions

data/lib/infinum_graylog/middleware.rb

@@ -6,7 +6,9 @@ module InfinumGraylog
 
     def call(env)
       request = ActionDispatch::Request.new(env)
-      InfinumGraylog::Notifier.request_id = request.uuid
+      if InfinumGraylog.can_subscribe?
+        InfinumGraylog::Notifier.request_id = request.uuid
+      end
       @app.call(env)
     end
   end

data/lib/infinum_graylog/subscriber.rb

@@ -1,8 +1,7 @@
 module InfinumGraylog
   class Subscriber
     def self.subscribe
-      return unless tls_and_files_exist?
-      return if InfinumGraylog.configuration.skip_environments.include?(Rails.env)
+      return unless InfinumGraylog.can_subscribe?
 
       puts '[InfinumGraylog] notifications configured'
 
@@ -18,12 +17,5 @@ module InfinumGraylog
 
       yield if block_given?
     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.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infinum_graylog
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Stjepan Hadjic