data_collector 0.39.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05ef65e41068e348fb98f4006fa50917f0d1f36b321193388e506dca9d912a07
-  data.tar.gz: c711d472ea38bdcb999d1b2ef3701e6b6fc0f7933bac137aa65537decb0d3137
+  metadata.gz: 4a1ff20af153214903e447f712e1103d1ad3f31c0d78116f0d53ada7e0ca4870
+  data.tar.gz: 8daf87004c13c9842f2c6c8bd32de92064e17305ec05cdcff6cc2d9aff3b83a5
 SHA512:
-  metadata.gz: 6093dea6542e5bb7a01d8149aff449912e606e1d482b0f5cf1d54a6845776592cbf84ee4fda979797aec66ceca00022ecc8e51fbdaf01123c6721aa879961c9b
-  data.tar.gz: effdc6c09bf03c1d1683e3c95eda047078a9daedd4a31bf350b531b6760921e4a618f5693f07a26faa3ed77039db7ec2c1c622f03b951debfded1ca1fc16377d
+  metadata.gz: 614d463b0325b3d0a258e29eb1eb201e95123b77d0dfce47f798417f21a55a5c35b4d1109e6be563278dcedb0add4d275ee2408359a1727d5668d141497ba780
+  data.tar.gz: cc6429da9bb97ca08e01b9180d7eaedaa2800cf9b663c8486658a15371da45bb4f3650b833d885020af2034d59ccc249682d6590cbc4b333441af7e405092790

data/lib/data_collector/ext/base.rb

@@ -3,27 +3,27 @@ require 'connection_pool'
 module BunnyBurrow
   class Connection
     include Singleton
-    attr_reader :connection, :started
+    attr_reader :connection
     attr_accessor :verify_peer, :connection_name, :rabbitmq_url
 
-    def initialize
-      super
-      @started = false
-    end
     def connection
-      @connection ||= Bunny.new(@rabbitmq_url, verify_peer: @verify_peer, connection_name: @connection_name)
-      unless @started
+      unless @connection
+        @connection = Bunny.new(@rabbitmq_url, verify_peer: @verify_peer, connection_name: @connection_name)
         @connection.start
-        @started = true
       end
 
+      @connection.start unless @connection.connected? || @connection.closed?
+      #@connection.start if @connection.closed?
+
+      #pp @connection.status
+
       @connection
     end
 
     def channel
-      @channel ||= ConnectionPool::Wrapper.new do
-        connection.create_channel
-      end
+      @channel = connection.create_channel unless @channel && @channel.open?
+
+      @channel
     end
   end
 
@@ -41,6 +41,7 @@ module BunnyBurrow
 
       unless @connection
         @connection = Connection.instance.connection
+        @connection.start unless @connection.open?
       end
 
       @connection
@@ -51,7 +52,7 @@ module BunnyBurrow
       Connection.instance.verify_peer = @verify_peer
       Connection.instance.rabbitmq_url = @rabbitmq_url
 
-      @channel ||= Connection.instance.channel
+      @channel = Connection.instance.channel
     end
   end
 end

data/lib/data_collector/input/rpc.rb

@@ -18,6 +18,8 @@ module DataCollector
           @listener.shutdown
           @running = false
         end
+      rescue Bunny::ConnectionAlreadyClosed => e
+        DataCollector::Core.log(e.message)
       rescue StandardError => e
         DataCollector::Core.error(e.message)
       end
@@ -28,8 +30,6 @@ module DataCollector
         DataCollector::Core.error(e.message)
       end
 
-
-
       def run(should_block = false, &block)
           @listener.subscribe(@bunny_queue) do |payload|
             payload = JSON.parse(payload)

data/lib/data_collector/output/rpc.rb

@@ -17,6 +17,10 @@ module DataCollector
           @running = false
           @producer.shutdown
         end
+      rescue Bunny::ConnectionAlreadyClosed => e
+        DataCollector::Core.log(e.message)
+      rescue StandardError => e
+        DataCollector::Core.error(e.message)
       end
 
       private

data/lib/data_collector/output.rb

@@ -182,7 +182,7 @@ module DataCollector
       raise "unable to save to file: #{e.message}"
     end
 
-    def to_jsonfile (jsondata, jsonfile)
+    def to_jsonfile(jsondata, jsonfile)
       raise '[DEPRECATED] `to_jsonfile` deprecated. Please use `to_uri("file://abc.json", {template: "template.erb", content_type: "application/json"})` instead'
     rescue Exception => e
       raise "unable to save to jsonfile: #{e.message}"

data/lib/data_collector/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module DataCollector
-  VERSION = "0.39.0"
+  VERSION = "0.41.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_collector
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.41.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-26 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport