Merge pull request #13 from Orange-OpenSource/issue_12

Send retry feature

Author: dchauviere-orange

lib/xymonclient.rb

@@ -12,14 +12,18 @@ module XymonClient
   #            (port default to 1984)
   class Client
     attr_reader :servers
+    attr_accessor :retry_count
+    attr_accessor :retry_interval
 
-    def initialize(servers = [])
+    def initialize(servers = [], retry_count = 3, retry_interval = 5)
       @servers = \
         if servers.empty?
           XymonClient::ServerDiscovery.find_from_file
         else
           _parse_servers(servers)
         end
+      @retry_count = retry_count
+      @retry_interval = retry_interval
     end
 
     def status(host, service, status, message, lifetime = '30m')
@@ -65,21 +69,40 @@ def ack(host, service, duration, message)
         unless XymonClient.valid_duration?(duration)
       cookies = board(host, service, ['cookie'])
       @servers.each do |server|
+        next if cookies[server].to_i == -1
         _send(
           server,
           "xymondack #{cookies[server].to_i} #{duration} #{message}"
-        ) if cookies[server].to_i != -1
+        )
       end
     end
 
     private
 
     def _send_to_all(message)
-      @servers.each { |server| _send(server, message) }
+      fail_srv = []
+      send_result = true
+      @servers.each do |server|
+        retry_count = 0
+        begin
+          _send(server, message)
+        rescue
+          if retry_count < @retry_count || @retry_count == -1
+            sleep @retry_interval
+            retry_count += 1
+            retry
+          else
+            send_result = false
+            fail_srv << server
+          end
+        end
+      end
+      raise XymonClient::SendFailure if fail_srv.count == @servers.count
+      raise XymonClient::PartialSendFailure, fail_srv \
+        if (1..@servers.count - 1).cover?(fail_srv.count)
     end
 
     def _send(server, message)
-      # TODO: validate response from all servers ( and retry ?)
       socket = TCPSocket.open(server[:host], server[:port])
       socket.puts message
       socket.close_write

lib/xymonclient/exception.rb

@@ -19,4 +19,10 @@ class InvalidHost < StandardError
 
   class InvalidServiceItem < StandardError
   end
+
+  class PartialSendFailure < StandardError
+  end
+
+  class SendFailure < StandardError
+  end
 end

lib/xymonclient/version.rb

@@ -1,3 +1,3 @@
 module XymonClient
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

spec/xymonclient_spec.rb

@@ -13,5 +13,36 @@
       )
       client.status('my.host', 'myservice', 'green', 'all is good')
     end
+
+    it 'could not send a status to some servers' do
+      client.retry_count = 0
+      times_called = 0
+      allow(client).to receive(:_send) do
+        times_called += 1
+        raise Errno::ECONNREFUSED if times_called == 2
+      end
+      expect do
+        client.status('my.host', 'myservice', 'green', 'all is good')
+      end.to raise_error(XymonClient::PartialSendFailure)
+    end
+
+    it 'could not send a status to all servers' do
+      allow(client).to receive(:_send).and_raise Errno::ECONNREFUSED
+      expect do
+        client.status('my.host', 'myservice', 'green', 'all is good')
+      end.to raise_error(XymonClient::SendFailure)
+    end
+
+    it 'retry sending a status to some servers' do
+      client.retry_count = 2
+      times_called = 0
+      allow(client).to receive(:_send) do
+        times_called += 1
+        raise Errno::ECONNREFUSED if times_called == 1
+      end
+      expect do
+        client.status('my.host', 'myservice', 'green', 'all is good')
+      end.not_to raise_error
+    end
   end
 end