riemann-babbler 1.2.4 → 1.2.5

data/config.yml

@@ -5,6 +5,8 @@ riemann:
   interval: 60 # update interval for all plugins 
   use_fqdn: true
   test_connect_on_start: true
+  responder:
+    port: 55755
 
 logger:
   level: DEBUG

data/lib/riemann/babbler/start.rb

@@ -4,7 +4,7 @@ require 'resolv'
 
 require 'riemann/babbler/support/deep_merge'
 require 'riemann/babbler'
-require 'riemann/babbler/support/pinger'
+require 'riemann/babbler/support/responder'
 
 class Riemann::Babbler::Starter
 
@@ -28,7 +28,7 @@ class Riemann::Babbler::Starter
     set_logger_lvl
     load_plugins
     $riemann = get_riemann
-    Riemann::Responder.new.start
+    Riemann::Responder.new(@config.riemann.responder.port, logger).start
     start_plugins!
   end
 

data/lib/riemann/babbler/support/responder.rb

@@ -0,0 +1,24 @@
+require 'net/http/server'
+require 'json'
+
+class Riemann::Responder
+
+  INFO = {
+      :version => Riemann::Babbler::VERSION,
+      :ruby => "#{RUBY_VERSION}-#{RUBY_PATCHLEVEL}"
+  }.freeze
+
+  def initialize(port = 55755, logger)
+    @port = port
+    @logger = logger
+  end
+
+  def start
+    Thread.new {
+      Net::HTTP::Server.run(:port => 8080) do |request,stream|
+        logger.unknown "Responder request: #{request}"
+        [200, {'Content-Type' => 'application/json'}, [INFO.to_json]]
+      end
+    }
+  end
+end

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '1.2.4'
+    VERSION = '1.2.5'
   end
 end

data/riemann-babbler.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency('net-ping')
   s.add_dependency('file-tail')
   s.add_dependency('sys-proctable')
+  s.add_dependency('net-http-server')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http-server
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Plugin manager for riemann.
 email:
 - vadv.mkn@gmail.com
@@ -194,8 +210,8 @@ files:
 - lib/riemann/babbler/start.rb
 - lib/riemann/babbler/support/deep_merge.rb
 - lib/riemann/babbler/support/monkey_patches.rb
-- lib/riemann/babbler/support/pinger.rb
 - lib/riemann/babbler/support/plugin_helpers.rb
+- lib/riemann/babbler/support/responder.rb
 - lib/riemann/babbler/version.rb
 - riemann-babbler.gemspec
 - spec/config.yml

data/lib/riemann/babbler/support/pinger.rb

@@ -1,33 +0,0 @@
-require 'socket'
-require 'json'
-
-class Riemann::Responder
-
-  INFO = {
-      :version => Riemann::Babbler::VERSION,
-      :ruby => "#{RUBY_VERSION}-#{RUBY_PATCHLEVEL}"
-  }.freeze
-
-  def initialize( port = 55755 )
-    @port = port
-  end
-
-  def start
-    @worker_thread = Thread.new {
-      Socket.tcp_server_loop(@port) do |sock, _|
-        begin
-          sock.puts INFO.to_json
-        ensure
-          sock.close
-        end
-      end
-    }
-  end
-
-  def stop
-    if @worker_thread
-      @worker_thread.kill
-      @worker_thread = nil
-    end
-  end
-end