riemann-babbler 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4cb348ec2b3429b7c55d42cf517995488eb71bf
-  data.tar.gz: 73edbc46985f2bafb7abb11e65ad5dc412a55096
+  metadata.gz: 424c014b8907bd1e525e74d60cefb61bcb1703de
+  data.tar.gz: 8c094a607d4a165938d6905b8bffcaf783d56148
 SHA512:
-  metadata.gz: 4f1dd30d413ee94ac51b4efd23f80e55ae0f746078d883b558eb60bbc2c237f60134f49555b8d732e765ef57d963773864294c1d793fa095fceeb8f5193c74bf
-  data.tar.gz: efe780da08ed8a3e5bd03ae9344db34a9ce7023b26628e01e7a6441e340e0ecdaea26a48d64d38ac7540aa2572977fe63f1c1af3214ec0653e5dd09745b04546
+  metadata.gz: 4511b3cd0355050da41c40e19b09c934878ff9fe5f0342ca7bc19fd3e0a10af6edce86ae14bc033414c7f3025bbdf0ef1e31cf3e87585533ffe3f615355eb5c1
+  data.tar.gz: f447ac5c27014e8b505781cdcd740a6f1257cbd015880379fbaedf37a319cb4d7c1a6f09878a59bc5d1d0f0103d14b4332a5de26fc0e854d51f7d9be137ef45b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riemann-babbler (2.5.1)
+    riemann-babbler (2.5.2)
       configatron
       docile
       file-tail

data/README.md

@@ -14,18 +14,19 @@ Usage:
        riemann-babbler [options]
 where [options] are:
                                        --config, -c <s>:   Config file (default: /etc/riemann-babbler/config.yml)
-                                         --host, -h <s>:   Riemann host (default: 127.0.0.1)
-                                         --port, -p <i>:   Riemann port (default: 5555)
+                                         --host, -h <s>:   Riemann server (default: 127.0.0.1)
+                                         --port, -p <i>:   Riemann server default port (default: 5555)
+                                      --backlog, -b <i>:   Riemann server backlog for events (default: 100)
                                       --timeout, -t <i>:   Riemann timeout (default: 5)
                                   --fqdn, --no-fqdn, -f:   Use fqdn for event hostname (default: true)
                                           --ttl, -l <i>:   TTL for events (default: 60)
                                      --interval, -i <i>:   Seconds between updates (default: 60)
                                     --log-level, -o <s>:   Level log (default: DEBUG)
-                            --plugins-directory, -u <s>:   Directory for plugins (default: /usr/share/riemann-babbler/plugins)
+                            --plugins-directory, -d <s>:   Directory for plugins (default: /usr/share/riemann-babbler/plugins)
                                         --tcp, --no-tcp:   Use TCP transport instead of UDP (improves reliability, slight overhead. (Default: true)
   --minimize-event-count, --no-minimize-event-count, -m:   Minimize count of sent messages (default: true)
                           --responder-bind-http, -r <s>:   Bind to http responder (default: 0.0.0.0:55755)
-                           --responder-bind-udp, -e <s>:   Bind to udp responder (default: 127.0.0.1:55955)
+                           --responder-bind-udp, -e <s>:   Bind to udp responder (default: 0.0.0.0:55955)
                                           --version, -v:   Print version and exit
                                                  --help:   Show this message
 ```

data/lib/riemann/babbler/sender_client.rb

@@ -19,11 +19,11 @@ module Riemann
           @host, @port   = host.split(':')
           @port ||= opts.riemann.port
           @events = Array.new
-          @riemann = client
           start
         end
 
         def start
+          build_client
           @running = true
           @runner = Thread.new do
             while @running
@@ -43,7 +43,7 @@ module Riemann
         end
 
         def <<(event)
-          @events.shift if @events.size < opts.riemann.backlog
+          @events.shift if @events.size > opts.riemann.backlog
           @events << event
         end
 
@@ -62,42 +62,21 @@ module Riemann
           end
         end
 
-        # riemann client connect
-        def client
-          sender = Riemann::Client.new(
-            :host    => resolv(@host), #todo: add ttl
-            :port    => @port,
-            :timeout => opts.riemann.timeout
-          )
-          sender = sender.tcp if opts.riemann.tcp
-          connect_client(sender)
+        # riemann client
+        def build_client
+          @riemann = nil 
+          @riemann = Riemann::Client.new(:host => resolv(@host), :port => @port, :timeout => opts.riemann.timeout)
+          @riemann = @riemann.tcp if opts.riemann.tcp
+          @riemann
         end
 
         #@return ipaddress of riemann server
         def resolv(host)
-          begin
-            ip = Resolv.new.getaddress(host)
-            log :debug, "Resolv host: #{host} => #{ip}"
-          rescue
-            log :fatal, "Can't resolv hostname: #{host}"
-            exit Errors::RESOLV_RIEMANN_SERVER
-          end
+          ip = Resolv.new.getaddress(host)
+          log :debug, "Resolv host: #{host} => #{ip}"
           ip
         end
 
-        #@return connect to riemann
-        def connect_client(riemann)
-          connect = riemann
-          begin
-            connect = riemann.connect if opts.riemann.tcp
-            log :debug, "Connected to #{riemann.host}:#{riemann.port}"
-          rescue
-            log :fatal, "Can't connect to riemann server: #{riemann.host}:#{riemann.port}"
-            exit Errors::INIT_CONNECT
-          end
-          connect
-        end
-
       end
     end
   end

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '2.5.1'
+    VERSION = '2.5.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Vasiliev Dmitry