data_collector 0.36.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 649b618a7676b2153451b2bc3053726dd332ccc95a58ce0fe7115f4c9cc5a7eb
-  data.tar.gz: 625ca0e9da4e6b986d7ead973c80fc04a87a5539f0f7263efc672ee0f3ef7eb1
+  metadata.gz: 7c584cb29547a8e6e2caf026d8860228366e2cae387ac4111c125e5450a90586
+  data.tar.gz: ea87c6fec5817023b653472f6566bf48e951755e16b8e5ab08378c4600ca01fe
 SHA512:
-  metadata.gz: 2372b50b9fc9e6f5a17575c1755e169f0ddbaef44ed96847d8f5c87b28a3e30e46276cf47f6e506fe843a2293190b54fd556978ea175f937693abd4f83a637dd
-  data.tar.gz: 7a417a9ee3a70140a3601d20613159222f6c2d6d0d7feaa99c447c7e31306f14c6f08c50543cb8fda85315b5fe62abde202e2b3bda51ac421f6a517f7b6be740
+  metadata.gz: c6b8fbe6975c800cd2ca179d6cc97555aa6b2cfa279d223f9cb52c03fa48186e336f6129701b820630eba912901c7d4b2a60f58678f282742cba36f4b46e0b3c
+  data.tar.gz: f08929aea4bb836e55a8ac0203cf14048ccfe1c60d1ed7af871625938877c0b2f38619cf2923da48bac9e002fa9dd37967639713390f0bc4c011dcd54f7eb50d

data/data_collector.gemspec

@@ -51,6 +51,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'builder', '~> 3.2'
   spec.add_runtime_dependency 'parse-cron', '~> 0.1'
   spec.add_runtime_dependency 'linkeddata', '~> 3.3'
+  spec.add_runtime_dependency 'connection_pool', '~> 2.4'
+
 
   spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'minitest', '~> 5.18'

data/lib/data_collector/ext/base.rb

@@ -0,0 +1,58 @@
+require 'connection_pool'
+
+module BunnyBurrow
+  class Connection
+    include Singleton
+    attr_reader :connection, :started
+    attr_accessor :verify_peer, :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
+        @connection.start
+        @started = true
+      end
+
+      @connection
+    end
+
+    def channel
+      @channel ||= ConnectionPool::Wrapper.new do
+        connection.create_channel
+      end
+    end
+  end
+
+  class Base
+    attr_accessor(
+      :name
+    )
+
+    private
+
+    def connection
+      Connection.instance.name = @name
+      Connection.instance.verify_peer = @verify_peer
+      Connection.instance.rabbitmq_url = @rabbitmq_url
+
+      unless @connection
+        @connection = Connection.instance.connection
+      end
+
+      @connection
+    end
+
+    def channel
+      Connection.instance.name = @name
+      Connection.instance.verify_peer = @verify_peer
+      Connection.instance.rabbitmq_url = @rabbitmq_url
+
+      @channel ||= Connection.instance.channel
+    end
+  end
+end
+

data/lib/data_collector/input/generic.rb

@@ -1,4 +1,7 @@
+require 'bunny_burrow'
+require_relative '../ext/base'
 require 'listen'
+require 'active_support/core_ext/hash'
 
 module DataCollector
   class Input

data/lib/data_collector/input/rpc.rb

@@ -1,9 +1,4 @@
 require_relative 'generic'
-require 'bunny_burrow'
-require 'active_support/core_ext/hash'
-require 'ostruct'
-require 'securerandom'
-require 'thread'
 
 module DataCollector
   class Input
@@ -64,6 +59,7 @@ module DataCollector
           server.rabbitmq_url = @bunny_uri.to_s
           server.rabbitmq_exchange = @bunny_channel
 
+          #server.connection_name = @name
           server.logger = DataCollector::Core.logger if log
         end
 

data/lib/data_collector/output/generic.rb

@@ -1,5 +1,7 @@
 require 'bunny_burrow'
+require_relative '../ext/base'
 require 'json'
+require 'active_support/core_ext/hash'
 
 module DataCollector
   class Output

data/lib/data_collector/output/rpc.rb

@@ -20,12 +20,14 @@ module DataCollector
       end
 
       private
-      def create_producer
+      def create_producer(log = false)
         @producer ||= BunnyBurrow::Client.new do |client|
           parse_uri
           client.rabbitmq_url = @bunny_uri.to_s
           client.rabbitmq_exchange = @bunny_channel
-          client.logger = DataCollector::Core.logger
+          #client.connection_name = @name
+
+          client.logger = DataCollector::Core.logger if log
           @running = true
         end
       end

data/lib/data_collector/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_collector
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2023-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -296,6 +310,7 @@ files:
 - lib/data_collector.rb
 - lib/data_collector/config_file.rb
 - lib/data_collector/core.rb
+- lib/data_collector/ext/base.rb
 - lib/data_collector/ext/xml_utility_node.rb
 - lib/data_collector/input.rb
 - lib/data_collector/input/dir.rb