data_collector 0.38.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c584cb29547a8e6e2caf026d8860228366e2cae387ac4111c125e5450a90586
-  data.tar.gz: ea87c6fec5817023b653472f6566bf48e951755e16b8e5ab08378c4600ca01fe
+  metadata.gz: 1345f920eefd428837193e35ec9e63d7213deebf4445685bb4c0c1d56c47b3a4
+  data.tar.gz: 33380a284a385eb268b2b42fc45e4e082bbb8ccdb7856ab43feef2bf55ff48fd
 SHA512:
-  metadata.gz: c6b8fbe6975c800cd2ca179d6cc97555aa6b2cfa279d223f9cb52c03fa48186e336f6129701b820630eba912901c7d4b2a60f58678f282742cba36f4b46e0b3c
-  data.tar.gz: f08929aea4bb836e55a8ac0203cf14048ccfe1c60d1ed7af871625938877c0b2f38619cf2923da48bac9e002fa9dd37967639713390f0bc4c011dcd54f7eb50d
+  metadata.gz: 17483e3ba00c9a3b137c1f0c6aa0b9655b02d81cd04c45cecc85e657defd21b4681d0f204dad999eb8ba372f2418aca026a0ddb10e62863dfdaf283bfeaaba07
+  data.tar.gz: 874443f2821d2a0387547ff7e936d52d2742eab12dd51fb73b67121a3fc332cf7c82a51d574481111fd98ab8ffaed82ec103cec08598aa44a0ef5c183b3c1dd2

data/lib/data_collector/ext/base.rb

@@ -3,55 +3,51 @@ require 'connection_pool'
 module BunnyBurrow
   class Connection
     include Singleton
-    attr_reader :connection, :started
-    attr_accessor :verify_peer, :name, :rabbitmq_url
+    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: @name)
-      unless @started
+      unless @connection
+        @connection = Bunny.new(@rabbitmq_url, verify_peer: @verify_peer, connection_name: @connection_name)
         @connection.start
-        @started = true
       end
 
       @connection
     end
 
     def channel
-      @channel ||= ConnectionPool::Wrapper.new do
-        connection.create_channel
-      end
+      @channel ||= connection.create_channel
+
+      @channel
     end
   end
 
   class Base
     attr_accessor(
-      :name
+      :connection_name
     )
 
     private
 
     def connection
-      Connection.instance.name = @name
+      Connection.instance.connection_name = @connection_name
       Connection.instance.verify_peer = @verify_peer
       Connection.instance.rabbitmq_url = @rabbitmq_url
 
       unless @connection
         @connection = Connection.instance.connection
+        @connection.start unless @connection.open?
       end
 
       @connection
     end
 
     def channel
-      Connection.instance.name = @name
+      Connection.instance.connection_name = @connection_name
       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/generic.rb

@@ -59,7 +59,7 @@ module DataCollector
 
       private
 
-      def create_listener
+      def create_listener(log = false)
         raise DataCollector::Error, 'Please implement a listener'
       end
 

data/lib/data_collector/input/rpc.rb

@@ -59,7 +59,7 @@ module DataCollector
           server.rabbitmq_url = @bunny_uri.to_s
           server.rabbitmq_exchange = @bunny_channel
 
-          #server.connection_name = @name
+          server.connection_name = @name
           server.logger = DataCollector::Core.logger if log
         end
 

data/lib/data_collector/output/generic.rb

@@ -11,6 +11,7 @@ module DataCollector
         @options = options
         @running = false
 
+        @name = options[:name] || "output-#{Time.now.to_i}-#{rand(10000)}"
         create_producer
       end
 
@@ -31,7 +32,7 @@ module DataCollector
       end
 
       private
-      def create_producer
+      def create_producer(log = false)
         raise DataCollector::Error, 'Please implement a producer'
       end
 

data/lib/data_collector/output/rpc.rb

@@ -25,7 +25,7 @@ module DataCollector
           parse_uri
           client.rabbitmq_url = @bunny_uri.to_s
           client.rabbitmq_exchange = @bunny_channel
-          #client.connection_name = @name
+          client.connection_name = @name
 
           client.logger = DataCollector::Core.logger if log
           @running = true

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.38.0"
+  VERSION = "0.40.0"
 end

metadata

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