circactivator 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efdaba283fa698f59a208157f064907b9e105c22
-  data.tar.gz: a5050fe21799adfc191ad3425992d13718ee95cb
+  metadata.gz: 7ed95230a086d93a38c5d556f9a93888de6f145e
+  data.tar.gz: 1f7a81e4dc8fd9b277c5f435d55a7569b295ab32
 SHA512:
-  metadata.gz: e3c5ac1e765dd68bc27f01251dfeec75f690bcf954f3dafc950a41246800940116030652f6f94f1a308e2dd9ae06f991ac7e6f5585aaec62d51ad8e4bfd4241a
-  data.tar.gz: 2bcc98f08a5db48d5c220948ac3359cbfdbbdccedfdb95d4677e3bbec6f43f20c03564452eb33765e2c70d0bae557be1a99ca1b9df8657ebfce04c364dc67611
+  metadata.gz: 2227f9e39cf93fc7d4d92158fe78ae854a898f930b073e6d5302436e5931b65a7292d986f925b4ad90e945d272f45c66378a1fc85ae1bb1205f945dfdc01e1b3
+  data.tar.gz: eed823bf909864f64cf974ae22883b222c285c97c0a1a0f04f2125cf7704dd4b8a01e9c25553bde61bacae06e28d5b7bbc2c085a7235efa55cbaf80caffe12b8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    circactivator (2.0.1)
+    circactivator (2.2.0)
       httparty (~> 0.13.3)
       mixlib-log (~> 1.6.0)
       settingslogic (~> 2.0.9)

data/README.md

@@ -53,6 +53,8 @@ circonus:
     base_url: https://api.circonus.com/v2
     api_key: your-api-key-here
     api_app_name: circactivator
+    verify: false
+    attempts: 3
 
 monitoring:
     error_file: /path/to/log/file/circactivator.err
@@ -72,7 +74,7 @@ The `log` section of the config sets up the log file CircActivator uses to log i
 
 ### Circonus
 
-The `circonus` section of the config specifies which Circonus instance to use (which is especially useful if you are a Circonus Inside customer) and your API key and app name.  See https://login.circonus.com/resources/api#authentication for more information.
+The `circonus` section of the config specifies which Circonus instance to use (which is especially useful if you are a Circonus Inside customer) and your API key and app name.  See https://login.circonus.com/resources/api#authentication for more information.  Additionally, you may disable SSL validation with the `verify: false` config item (in the event you're running a Circonus Inside system using an untrusted CA), and how many times CircActivator will try an API call upon failure or timeout (defaults to 3).
 
 ### Monitoring
 

data/lib/circactivator/checkupdater.rb

@@ -44,11 +44,33 @@ module CircActivator
     end
 
     def fetch
-      response = HTTParty.get(url + '?query_broker=1', headers: http_headers, verify: false)
-      raise_exceptions!(response)
+      response = call_circonus(:get, url + '?query_broker=1')
       @check_bundle = JSON.load(response.body)
     end
 
+    def update
+      response = call_circonus(:put, url, body: payload_hash.to_json)
+    end
+
+    def call_circonus(method, url, options={})
+      options[:headers] = http_headers
+      options[:verify]  = CircActivator::Config.circonus.fetch('verify', true)
+
+      attempt = 0
+      begin
+        attempt += 1
+        response = HTTParty.send(method, url, options)
+        raise_exceptions!(response)
+      rescue Net::OpenTimeout, Net::ReadTimeout, CircActivator::Exception::CirconusError
+        raise if attempt >= attempts
+        retry
+      rescue CircActivator::Exception::CheckNotFound
+        raise
+      end
+
+      response
+    end
+
     def activate_metrics
       return if @check_bundle['metrics'].nil?
       updated_metrics = Array.new
@@ -65,11 +87,6 @@ module CircActivator
       @check_bundle.select { |k,v| k =~ /brokers|config|display_name|metrics|notes|period|status|tags|target|timeout|type/ }
     end
 
-    def update
-      response = HTTParty.put(url, headers: http_headers, body: payload_hash.to_json, verify: false)
-      raise_exceptions!(response)
-    end
-
     def raise_exceptions!(response)
       case response.code.to_s
       when /^2/
@@ -85,9 +102,15 @@ module CircActivator
     def run(logging=false)
       fetch
       updated_metrics = activate_metrics
-      update
+      update if updated_metrics.length > 0
       
       updated_metrics
     end
+
+    private
+
+    def attempts
+      CircActivator::Config.circonus['attempts'] || 3
+    end
   end
 end

data/lib/circactivator/version.rb

@@ -17,5 +17,5 @@
 #
 
 module CircActivator
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/spec/checkupdater_spec.rb

@@ -125,14 +125,24 @@ describe CircActivator::CheckUpdater do
       @checkupdater.run
     end
 
-    it "#run does not debug log if logging is disabled (disabled by default)" do
-      expect(CircActivator::Log).to_not receive(:debug)
-      @checkupdater.run
+    it 'retries the HTTP call in the event of a server failure' do
+      bad_response  = double('bad_response', code: 500, body: 'server error')
+      good_response = double('good_response', code: 200, body: 'check data')
+
+      expect(HTTParty).to receive(:get).twice.and_return(bad_response, good_response)
+      @checkupdater.call_circonus(:get, '/test-url')
+    end
+
+    it 'raises an error after attempts exceeded' do
+      response = double('response', code: 500, body: 'server error')
+      expect(HTTParty).to receive(:get).exactly(3).times.and_return(response)
+      expect { @checkupdater.call_circonus(:get, '/test-url') }.to raise_error(CircActivator::Exception::CirconusError)
     end
 
-    it '#run debug logs when logging is enabled' do
-      expect(CircActivator::Log).to receive(:debug).exactly(3).times
-      @checkupdater.run(logging=true)
+    it 'does not retry on a 404' do
+      response = double('response', code: 404)
+      expect(HTTParty).to receive(:get).once.and_return(response)
+      expect { @checkupdater.call_circonus(:get, '/test-url') }.to raise_error(CircActivator::Exception::CheckNotFound)
     end
   end
 end

data/spec/support/fixtures/config/config.yml

@@ -1,5 +1,5 @@
 log:
-    file: /Users/adam/tmp/circactivator.log
+    file: log/circactivator.log
     level: debug
     count: 7
 
@@ -7,9 +7,11 @@ circonus:
     base_url: https://api.circonus.com/v2
     api_key: a12345
     api_app_name: my_app
+    verify: false
+    attempts: 3
 
 monitoring:
-    error_file: /Users/adam/tmp/circactivator.err
+    error_file: log/circactivator.err
 
 check_bundles:
     iad1-prod:
@@ -17,4 +19,4 @@ check_bundles:
         2: api-web
     iad1-nonprod:
         3: .*
-        4: .*
+        4: .*

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circactivator
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Adam Leff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty