fluent-plugin-nng 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0bf929dc703bbcecd109a42516ab9cccf40bd056a9e9fd21645884c0dd1a123
-  data.tar.gz: d3be3ba9da322adfd364165efa83b55659983ff31ba06f3be6f437e6f026e8a1
+  metadata.gz: 1c5c435130e3492dd738080d8bef6858d645bee96b5f8abc16b4cca29fc8d5a4
+  data.tar.gz: a133ffe2e408bfbeb0886ec86465e1a0ff899c4967ba6c65c0f165236bbc763a
 SHA512:
-  metadata.gz: cabfb3cf6166341d617d60df6ffe4828fad9188b9407734dfcf77e0282679a76ecb5445c9de2eaead1c8024a06193b595ca05f44cb41c8f8f5d3e0fc7149d022
-  data.tar.gz: ee9e6fc8de98325509a7544c8996091ac0eb08e15ae8661f1903be3f8473ff0562027f352c119f8e2f7e6460be20c3f76fcbd452d820f45303800ea4e9986e0b
+  metadata.gz: 5957f996cec955b679a209e2cf79e16037925f8ee376a320e41848822601eaffa642ef2c0d641cd0d2700805ca03182714fbb36b0a03bd70e8f2ae23a6a1d3f6
+  data.tar.gz: ed805f39f85932eb52d3028a4782ef241c112f1f88fff0ac195d52dfc720d00e321a9ff57bef088efb4fcc2321f41b922234fef5cbec0dd64cf87230cae5659c

data/fluent-plugin-nng.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-nng'
-  spec.version = '1.0.0'
+  spec.version = '1.0.2'
   spec.authors = ['whotwagner']
   spec.email   = ['code@feedyourhead.at']
 
@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.6.9'
   spec.add_development_dependency 'rake', '~> 13.3.1'
   spec.add_development_dependency 'test-unit', '~> 3.6.7'
+  spec.add_development_dependency 'mocha', '~> 3.1.0'
   spec.add_runtime_dependency 'nng', '~> 1.0.1'
   spec.add_runtime_dependency "fluentd", [">= 0.14.10", "< 2"]
 end

data/lib/fluent/plugin/{in_nng.rb → in_nng_in.rb}

@@ -27,18 +27,26 @@ module Fluent
       config_param :uri, :string, default: 'tcp://127.0.0.1:5555'
       config_param :recv_timeout, :float, default: 1.0
       config_param :tag, :string, default: 'nng.input'
+      # TLS-Settings
+      config_param :cert, :string, default: nil
+      config_param :key, :string, secret: true, default: nil
+      config_param :ca, :string, default: nil
+      config_param :verify, :bool, default: false
+      config_param :server_name, :string, default: nil
 
       def configure(conf)
+        compat_parameters_convert(conf, :parser)
+        super
+
         if @uri !~ /\A#{URI::RFC2396_PARSER.make_regexp(['tcp', 'ipc', 'inproc', 'ws', 'tls+tcp'])}\z/
           raise Fluent::ConfigError, 'uri must be one of: tcp:// ipc:// inproc:// ws:// or tls+tcp://'
         end
 
-        compat_parameters_convert(conf, :parser)
         parser_config = conf.elements('parse').first
         unless parser_config
-          raise Fluent::ConfigError, "<parse> section is required."
+          raise Fluent::ConfigError, '<parse> section is required.'
         end
-        super
+
         log.info "parser: #{parser_config}"
         @parser = parser_create(conf: parser_config)
       end
@@ -56,7 +64,7 @@ module Fluent
           File.exist?(uri.path) && File.delete(uri.path)
         end
         @socket = NNG::Socket::Pair0.new
-        @socket.listen(@uri)
+        @socket.listen(@uri, cert: @cert, key: @key, ca: @ca, verify: @verify, server_name: @server_name)
         @socket.recv_timeout = @recv_timeout
       end
 
@@ -67,13 +75,14 @@ module Fluent
       end
 
       def run
-        log.info "start looping.."
+        log.info 'Start listening..'
         loop do
           msg = nil
           until msg
             if @stop
               return
             end
+
             begin
               msg = @socket.receive
             rescue Timeout::Error
@@ -85,19 +94,18 @@ module Fluent
             router.emit(@tag, time || Fluent::Engine.now, record)
           end
         end
-
       end
 
       def stop
-        log.info "Stopping.."
+        log.info 'Stopping..'
         @stop = true
         super
       end
 
       def shutdown
-        log.info "Initiate shutdown"
+        log.info 'Initiate shutdown'
         if @socket
-          log.info "stopping nng-socket"
+          log.info 'stopping nng-socket'
           @socket.close
         end
         super

data/lib/fluent/plugin/{out_nng.rb → out_nng_out.rb}

@@ -1,6 +1,6 @@
 require 'fluent/plugin/output'
 require 'nng'
-
+require 'uri'
 
 module Fluent::Plugin
   class NngOutput < Fluent::Plugin::Output
@@ -11,6 +11,12 @@ module Fluent::Plugin
     config_param :uri, :string, default: 'tcp://127.0.0.1:5559'
     config_param :max_retry, :integer, default: 100
     config_param :retry_time, :integer, default: 5
+    # TLS-Settings
+    config_param :cert, :string, default: nil
+    config_param :key, :string, secret: true, default: nil
+    config_param :ca, :string, default: nil
+    config_param :verify, :bool, default: nil # needs to be nil!
+    config_param :server_name, :string, default: nil
 
     config_section :format do
       config_set_default :@type, 'json'
@@ -19,20 +25,21 @@ module Fluent::Plugin
     def initialize
       super
       @formatter = nil
-      log.info 'Initializing'
+      log.debug 'Initializing'
     end
 
     def configure(conf)
-      log.info "configuring.."
+      log.debug 'configuring..'
       compat_parameters_convert(conf, :formatter, :inject)
+      super
+
       if @uri !~ /\A#{URI::RFC2396_PARSER.make_regexp(['tcp', 'ipc', 'inproc', 'ws', 'tls+tcp'])}\z/
         raise Fluent::ConfigError, 'uri must be one of: tcp:// ipc:// inproc:// ws:// or tls+tcp://'
       end
 
-      super
-      log.info "Creating formatter"
+      log.info 'Creating formatter'
       @formatter = formatter_create
-      log.info "Formatter loaded"
+      log.info 'Formatter loaded'
     end
 
     def start
@@ -50,15 +57,16 @@ module Fluent::Plugin
       try = 0
 
       begin
-        @socket.dial(@uri)
+        @socket.dial(@uri, cert: @cert, key: @key, ca: @ca, verify: @verify, server_name: @server_name)
       rescue => e
         log.error(e)
-        log.info("Retry in 5sec")
+        log.info("Retry in #{@retry_time} sec")
         sleep(@retry_time)
         try += 1
         if @max_retry > 0 && try >= @max_retry
           raise Fluent::UnrecoverableError, e.message
         end
+
         retry
       end
     end
@@ -69,7 +77,7 @@ module Fluent::Plugin
     end
 
     def shutdown
-      log.info("Shutdown socket")
+      log.info('Shutdown socket')
       @socket.close
       super()
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nng
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - whotwagner
 bindir: bin
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.7
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: nng
   requirement: !ruby/object:Gem::Requirement
@@ -92,13 +106,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- "-la"
 - LICENSE
 - README.md
 - Rakefile
 - fluent-plugin-nng.gemspec
-- lib/fluent/plugin/in_nng.rb
-- lib/fluent/plugin/out_nng.rb
+- lib/fluent/plugin/in_nng_in.rb
+- lib/fluent/plugin/out_nng_out.rb
 homepage: https://github.com/ait-detectmate/fluent-plugin-nng
 licenses:
 - EUPL-1.2

data/-la

@@ -1,231 +0,0 @@
-
-Δ README.md
-────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
-
-───────────────────────────────────────────────────────────────────────────────────────┐
-• 19: parses the data using the fluentd-plugin [fluent-plugin-parser-protobuf](https:/ │
-───────────────────────────────────────────────────────────────────────────────────────┘
-
-```
-<source>
-  @type nng
-  @type nng_in
-  @id input_nng
-  <parse>
-    @type protobuf
-
-───────────────────────────────────────────────────────────────────────────────────────┐
-• 28: parses the data using the fluentd-plugin [fluent-plugin-parser-protobuf](https:/ │
-───────────────────────────────────────────────────────────────────────────────────────┘
-    protobuf_version protobuf3
-  </parse>
-  uri tcp://127.0.0.1:5557
-  tag nng.*
-</source>
-
-<match nng.**>
-
-───────────────────────────────────────────────────────────────────────────────────────┐
-• 55: using the detectmate `LogSchema` using [fluent-plugin-detectmate](https://github │
-───────────────────────────────────────────────────────────────────────────────────────┘
-</source>
-
-<match nng.**>
-  @type nng
-  @type nng_out
-  uri tcp://127.0.0.1:5557
-  <inject>
-    hostname_key hostname
-
-Δ fluent-plugin-nng.gemspec
-────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
-
-─────────────────────────────────────────────────────────────┐
-• 3: $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) │
-─────────────────────────────────────────────────────────────┘
-
-Gem::Specification.new do |spec|
-  spec.name    = "fluent-plugin-nng"
-  spec.version = "0.1.1"
-  spec.version = "1.0.0"
-  spec.authors = ["whotwagner"]
-  spec.email   = ["code@feedyourhead.at"]
-
-
-───────────────────────────────────────┐
-• 21: Gem::Specification.new do |spec| │
-───────────────────────────────────────┘
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 2.6.9"
-  spec.add_development_dependency "rake", "~> 13.3.1"
-  spec.add_development_dependency "test-unit", "~> 3.6.7"
-  spec.add_runtime_dependency "nng-ruby", "~> 1.0.1"
-  spec.add_development_dependency 'bundler', '~> 2.6.9'
-  spec.add_development_dependency 'rake', '~> 13.3.1'
-  spec.add_development_dependency 'test-unit', '~> 3.6.7'
-  spec.add_runtime_dependency 'nng', '~> 1.0.1'
-  spec.add_runtime_dependency "fluentd", [">= 0.14.10", "< 2"]
-end
-
-Δ lib/fluent/plugin/in_nng.rb
-────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
-
-──────┐
-• 15: │
-──────┘
-
-require 'fluent/plugin/input'
-require 'nng'
-require 'uri'
-
-module Fluent
-  module Plugin
-    class NngInput < Fluent::Plugin::Input
-      Fluent::Plugin.register_input('nng', self)
-      Fluent::Plugin.register_input('nng_in', self)
-
-      helpers :parser, :compat_parameters
-      helpers :parser, :compat_parameters, :thread
-
-      config_param :uri, :string, default: 'tcp://127.0.0.1:5555'
-      config_param :recv_timeout, :float, default: 1.0
-      config_param :tag, :string, default: 'nng.input'
-
-      def configure(conf)
-        if @uri !~ /\A#{URI::RFC2396_PARSER.make_regexp(['tcp', 'ipc', 'inproc', 'ws', 'tls+tcp'])}\z/
-
-────────────────────┐
-• 55: module Fluent │
-────────────────────┘
-        if uri.scheme == 'ipc'
-          File.exist?(uri.path) && File.delete(uri.path)
-        end
-        @socket = NNG::Socket.new(:pair0)
-        @socket = NNG::Socket::Pair0.new
-        @socket.listen(@uri)
-        @socket.recv_timeout = 5000
-        @socket.recv_timeout = @recv_timeout
-      end
-
-      def start
-        super
-        listen
-        run
-        thread_create(:nng_input_run, &method(:run))
-      end
-
-      def run
-        log.info "start looping.."
-        loop do
-          begin
-            msg = nil
-            until msg
-              if @stop
-                return
-              end
-              begin
-                msg = @socket.recv
-              rescue NNG::Error
-                next
-              end
-          msg = nil
-          until msg
-            if @stop
-              return
-            end
-            tag = "nng.input"
-            @parser.parse(msg) do |time, record|
-              router.emit(tag, time, record)
-            begin
-              msg = @socket.receive
-            rescue Timeout::Error
-              sleep 0.01
-              next
-            end
-          rescue NNG::Error => e
-            log.warn "Error in processing message.", :error_class => e.class, :error => e
-          end
-          @parser.parse(msg) do |time, record|
-            router.emit(@tag, time || Fluent::Engine.now, record)
-          end
-        end
-
-
-Δ lib/fluent/plugin/out_nng.rb
-────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
-
-───────────────────┐
-• 4: require 'nng' │
-───────────────────┘
-
-module Fluent::Plugin
-  class NngOutput < Fluent::Plugin::Output
-    Fluent::Plugin.register_output('nng', self)
-    Fluent::Plugin.register_output('nng_out', self)
-
-    helpers :formatter, :inject, :compat_parameters
-
-    config_param :uri, :string, default: 'tcp://127.0.0.1:5559'
-    config_param :max_retry, :integer, default: 1000
-    config_param :max_retry, :integer, default: 100
-    config_param :retry_time, :integer, default: 5
-
-    config_section :format do
-      config_set_default :@type, 'json'
-
-────────────────────────────┐
-• 19: module Fluent::Plugin │
-────────────────────────────┘
-    def initialize
-      super
-      @formatter = nil
-      log.info 'Initializing'
-    end
-
-    def configure(conf)
-      log.info "configuring.."
-      compat_parameters_convert(conf, :formatter, :inject)
-      if @uri !~ /\A#{URI::RFC2396_PARSER.make_regexp(['tcp', 'ipc', 'inproc', 'ws', 'tls+tcp'])}\z/
-        raise Fluent::ConfigError, 'uri must be one of: tcp:// ipc:// inproc:// ws:// or tls+tcp://'
-      end
-
-      super
-      log.info "Creating formatter"
-      @formatter = formatter_create
-      log.info "Formatter loaded"
-    end
-
-    def start
-      super
-      log.info "Starting listener at: #{@uri}"
-      log.info "Initiating connection to: #{@uri}"
-      connect
-    end
-
-
-────────────────────────────┐
-• 46: module Fluent::Plugin │
-────────────────────────────┘
-    end
-
-    def connect
-      @socket = NNG::Socket.new(:pair0)
-      @socket = NNG::Socket::Pair0.new
-      try = 0
-
-      begin
-        @socket.dial(@uri)
-      rescue NNG::Error => e
-      rescue => e
-        log.error(e)
-        log.info("Retry in 5sec")
-        sleep(5)
-        sleep(@retry_time)
-        try += 1
-        if try >= @max_retry
-        if @max_retry > 0 && try >= @max_retry
-          raise Fluent::UnrecoverableError, e.message
-        end
-        retry