xymonclient 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 433597de8de574da85cec7099ff4829917da96e5
-  data.tar.gz: 2ff97c778a0827001f3ccb53765b9f154ca544ed
+  metadata.gz: b2178d1cc649bd47137710b76bfd567e3648ec39
+  data.tar.gz: deb2925a13f311a4a598fe524a17c41bf413248f
 SHA512:
-  metadata.gz: 4251c26893977fa16afc8497c977c57d4ab78e1e6433896b05e7c01213ea4c6c933a18b12c61b8b8b2530a8290598ebed210f61ab03c90a08fb1378ce187ef8e
-  data.tar.gz: bf3be7509dd5129d42dbb1d9fa1ad6600433e573c69f472c71ed89e1814b6b318707f59914611d9551ec38baf6fba106a2ae4f37b6fd0acd678b3a457ed85144
+  metadata.gz: 6d978c6d7d89dce1e6a1a30ba0cef55d86b03fb38c18ee3b27a3360051705ef4aec2483df5cd2e9283e790ccddae88ba019d73449a5b90a45b6cec752b6ff3d5
+  data.tar.gz: 9b272aece7341bd23418aa2f4b3649d12fdd6016fec6def9560bad69843caee763e05a13dc68a7db993587562b59e6a4bb5a91458f4a25d8f9c894ac80f84055

data/Gemfile.lock

@@ -1,21 +1,22 @@
 PATH
   remote: .
   specs:
-    xymonclient (0.3.0)
+    xymonclient (0.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.3.0)
-    codeclimate-test-reporter (1.0.5)
-      simplecov
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
     diff-lcs (1.3)
     docile (1.1.5)
-    json (2.0.2-java)
-    parser (2.3.3.1)
+    json (2.1.0-java)
+    parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (10.5.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -42,7 +43,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.2.1)
 
 PLATFORMS
   java
@@ -56,4 +57,4 @@ DEPENDENCIES
   xymonclient!
 
 BUNDLED WITH
-   1.14.2
+   1.14.5

data/lib/xymonclient/exception.rb

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

data/lib/xymonclient/version.rb

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

data/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 @@ module XymonClient
         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

data/spec/xymonclient_spec.rb

@@ -13,5 +13,36 @@ describe XymonClient do
       )
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xymonclient
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - David Chauviere
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement