nat-monitor 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39809faab717e9222a32e1520359264a4834b6b4
-  data.tar.gz: 6035485c770176b543d8d05cf61a71967e494ac2
+  metadata.gz: 3974f14b7e72be030eeb18f106c75cb253108ca9
+  data.tar.gz: 78bce4f038843212f57028f8dc7f2650191ac030
 SHA512:
-  metadata.gz: 50c4559ab357e3709eb4c38a7d78948d98334fc49ccd1fa419de097c295bd7375db66becea3444d919ad4b7f994001f9b464864aa0a7c20c03c059a70e40edc4
-  data.tar.gz: 03d4a9b94634733abb3685dd59a1923509de74872e727a630a43af92ac2b3115a423f55e612a323af0b3ad07f716ecd4911d2eb963da7700ed5a08a237f98bd0
+  metadata.gz: d18a2e90c2f7a0dfcfae9ce8a807feacd31531bb908e52a18224d8c851118654d7910ba6938e9d81974483d0daae8bce7747bad63a4789ad918f4a19e79978e9
+  data.tar.gz: beccbe7e6d3ae70c45e2d79dfb47ebab6774ad0fa03e8370f249facdd2fcd7d86e9ed78be38a3abb4b6b6678734f2835fbba061ff1ab0e3eb3e27a8dc854c2f4

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/nat-monitor.svg)](http://badge.fury.io/rb/nat-monitor)
+
 # nat-monitor
 
 Monitors a quorum of NAT servers for an outage and reassigns the specified EC2 route table to point to a working server.
@@ -69,7 +71,7 @@ The NAT Monitor has the ability to report out, via a simple URL request, its sta
 Requisite configuration needed:
 
 ```yaml
-monitor:
+monitor_urls:
     begin: your.url/run
     success: your.url/complete
     fail: your.url/fail

data/lib/nat-monitor.rb

@@ -21,24 +21,22 @@ module EtTools
     end
 
     def validate!
-      exit_code = false
-
-      case
-      when !@conf['route_table_id']
-        msg = 'route_table_id not specified'
-        exit_code = 1
-      when !route_exists?(@conf['route_table_id'])
-        msg = "Route #{@conf['route_table_id']} not found"
-        exit_code = 2
-      when @conf['nodes'].count < 3
-        msg = '3 or more nodes are required to create a quorum'
-        exit_code = 3
-      end
+      exit_code =
+        case
+        when !@conf['route_table_id']
+          msg = 'route_table_id not specified'
+          1
+        when !route_exists?(@conf['route_table_id'])
+          msg = "Route #{@conf['route_table_id']} not found"
+          2
+        when @conf['nodes'].count < 3
+          msg = '3 or more nodes are required to create a quorum'
+          3
+        end
 
       return unless exit_code
 
       notify_monitor 'fail', msg
-      output msg
       exit exit_code
     end
 
@@ -58,7 +56,6 @@ module EtTools
         rescue => e
           msg = "Caught #{e.class} exception: #{e.message}"
           notify_monitor 'fail', msg
-          output msg
           output e.backtrace
         end
         sleep @conf['heartbeat_interval']
@@ -160,10 +157,13 @@ module EtTools
     end
 
     def notify_monitor(status, msg = nil)
+      output msg
       return unless @conf['monitor_enabled']
-      url = monitor_url status
+      url = @conf['monitor_urls'][status]
       url += "?msg=#{msg}" if status == 'fail' && !msg.nil?
 
+      output 'Notifying external heartbeat monitor'
+
       Net::HTTP.get(URI url)
     end
 
@@ -179,9 +179,5 @@ module EtTools
         s.send(level, message)
       end
     end
-
-    def monitor_url(status)
-      @conf['monitor'][status]
-    end
   end
 end

data/lib/nat-monitor/version.rb

@@ -1,5 +1,5 @@
 module EtTools
   class NatMonitor
-    VERSION = '1.1.0'
+    VERSION = '2.0.0'
   end
 end

data/spec/lib/nat-monitor_spec.rb

@@ -13,7 +13,7 @@ describe EtTools::NatMonitor do
     @yaml_conf = { 'route_table_id' => @route_table_id,
                    'aws_access_key_id' => 'AWS_ACCESS_KEY_ID',
                    'aws_secret_access_key' => 'AWS_SECRET_ACCESS_KEY',
-                   'monitor' => {
+                   'monitor_urls' => {
                      'begin'   => 'run',
                      'success' => 'complete',
                      'fail'    => 'fail'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nat-monitor
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Eric Herot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec