riemann-tools 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e19bf35e435918b5107c15cbcaabbe6da5c707e771dead6f971f38babe6967c7
-  data.tar.gz: fab496cdc89a6fdfa45b5740189b09d23dc3014d47a2e4fc889e19464eb365f8
+  metadata.gz: fa9747ae11420451d621eac1f337dc543d3ee395cfde545ca1b819070ad0caef
+  data.tar.gz: f7d3b2a6493bcf478778a517f57a46179659e6c8b49bbe73c2769a82de3dbf8d
 SHA512:
-  metadata.gz: d0f40cd275ad0e71191bd021d16bc197be89b3ef869bd2ac3e0734b5444e89abb1e4db1976dffcb9911d567f24be17d2fd4103e85098866152fa5a4cd426f2cf
-  data.tar.gz: e141ca404e46fd6e4a95030dade5f0062ed670a191ed03022d1cfcab607ab46579c32dc75e80ea8ddaed3799477869dceaab44d5685dfbe91b17d906cdd1dc63
+  metadata.gz: 70855a5ff26bf7f02a35f80a86348ba3401db6576c6e7b97fa900c5ae134c6d4f4d066a1a6455c83a268442fb38b4a6ed36fae70d1aad3f759db9de97e1aa8fd
+  data.tar.gz: f9658262416652b5844b2f9b25d507e200da60b28ec50d6b8d56c1889b820e0c97457b79faf8feb19eaf7f40f8edb23ebc29676f49a078a478b1e78cc943c6a0

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-## [v1.8.0](https://github.com/riemann/riemann-tools/tree/v1.8.0) (2023-02-01)
+## [v1.8.1](https://github.com/riemann/riemann-tools/tree/v1.8.1) (2023-02-27)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.8.0...v1.8.1)
+
+**Fixed bugs:**
+
+- Improve event sending thread lifecycle management [\#265](https://github.com/riemann/riemann-tools/pull/265) ([smortex](https://github.com/smortex))
+- Make sure all events are send before terminating [\#264](https://github.com/riemann/riemann-tools/pull/264) ([smortex](https://github.com/smortex))
+
+## [v1.8.0](https://github.com/riemann/riemann-tools/tree/v1.8.0) (2023-02-02)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.7.1...v1.8.0)
 

data/lib/riemann/tools/riemann_client_wrapper.rb

@@ -7,52 +7,66 @@ require 'riemann/client'
 module Riemann
   module Tools
     class RiemannClientWrapper
-      include Singleton
+      attr_reader :options
+
+      def initialize(options)
+        @options = options
 
-      def initialize
-        @client = nil
         @queue = Queue.new
         @max_bulk_size = 1000
-      end
-
-      def configure(options)
-        return self unless @client.nil?
-
-        r = Riemann::Client.new(
-          host: options[:host],
-          port: options[:port],
-          timeout: options[:timeout],
-          ssl: options[:tls],
-          key_file: options[:tls_key],
-          cert_file: options[:tls_cert],
-          ca_file: options[:tls_ca_cert],
-          ssl_verify: options[:tls_verify],
-        )
-
-        @client = if options[:tcp] || options[:tls]
-                    r.tcp
-                  else
-                    r
-                  end
+        @draining = false
 
         @worker = Thread.new do
+          Thread.current.abort_on_exception = true
           loop do
             events = []
 
             events << @queue.pop
             events << @queue.pop while !@queue.empty? && events.size < @max_bulk_size
 
-            @client.bulk_send(events)
+            client.bulk_send(events)
+          rescue Riemann::Client::Error => e
+            warn "Dropping #{events.size} event#{'s' if events.size > 1} due to #{e}"
+          rescue StandardError => e
+            warn "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
+            Thread.main.terminate
           end
         end
-        @worker.abort_on_exception = true
 
-        self
+        at_exit { drain }
+      end
+
+      def client
+        @client ||= begin
+          r = Riemann::Client.new(
+            host: options[:host],
+            port: options[:port],
+            timeout: options[:timeout],
+            ssl: options[:tls],
+            key_file: options[:tls_key],
+            cert_file: options[:tls_cert],
+            ca_file: options[:tls_ca_cert],
+            ssl_verify: options[:tls_verify],
+          )
+
+          if options[:tcp] || options[:tls]
+            r.tcp
+          else
+            r
+          end
+        end
       end
 
       def <<(event)
+        raise('Cannot queue events when draining') if @draining
+
         @queue << event
       end
+
+      def drain
+        @draining = true
+        sleep(1) until @queue.empty? || @worker.stop?
+      end
     end
   end
 end

data/lib/riemann/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Riemann
   module Tools # :nodoc:
-    VERSION = '1.8.0'
+    VERSION = '1.8.1'
   end
 end

data/lib/riemann/tools.rb

@@ -73,7 +73,7 @@ module Riemann
     end
 
     def riemann
-      @riemann ||= RiemannClientWrapper.instance.configure(options)
+      @riemann ||= RiemannClientWrapper.new(options)
     end
     alias r riemann
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -367,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Utilities which submit events to Riemann.