lib/riemann/tools.rb in riemann-tools-1.1.1 vs lib/riemann/tools.rb in riemann-tools-1.2.0

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 module Riemann
   module Tools
     require 'optimist'
-    require 'riemann/client'
+    require 'riemann/tools/riemann_client_wrapper'
 
     def self.included(base)
       base.instance_eval do
         def run
           new.run
@@ -70,29 +70,11 @@
       event = event.merge(attributes)
 
       riemann << event
     end
 
-    def new_riemann_client
-      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
-
     def riemann
-      @riemann ||= new_riemann_client
+      @riemann ||= RiemannClientWrapper.instance.configure(options)
     end
     alias r riemann
 
     def run
       t0 = Time.now