aws-watcher 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f28f50f0ca7431183991d62d6ace837e3cc4c99b
-  data.tar.gz: 06704407b72737f799420afd04406926fa945052
+  metadata.gz: 2bf8eeafa65fe3b5e1c3be1c34c3d6a5bb012379
+  data.tar.gz: 4c71a451b443e2da69140601bc10f9aac7eb5208
 SHA512:
-  metadata.gz: 4aa9aae62d9199e876121220d4321aaa17c13d87986c26ae24fa167388e620f8587eb1054855b8eccc24cee8e3bf0a431d2817438ee55abaf87fa807d899ef2b
-  data.tar.gz: beb7e55a6c11aa2c6a09a48ea3f83b07b7d0519ce05ebbf55620c5ebfaf0b21b28d3c1215961b799905a4c9742b5a703489db434900fcbfad8c25e5ba0ae1d23
+  metadata.gz: 4b0839c4435fa5cbb5012030fbc1bb99ec8c060ebfc0118fbdd6fe6aa5457de4a783a41b438da2f55cb235356e4f5163cdecb8f33155cf9c4970051093d05723
+  data.tar.gz: b9cefb0f11336db142c711e6023f4229894318620adaf2d9d0f542d883f8788766e4aae051d7d0f062a3aa73307eeb12e991cf67f1f1a48fb2489c3754be04b1

data/bin/aws_watcher.rb

@@ -53,9 +53,9 @@ loop do
     visibility_timeout: 3
   ).messages
 
-  puts "Got #{messages.size} messages"
+  puts "Got #{messages.size} message(s)"
   messages.each_with_index do |message, index|
-    puts "Looking at message number #{index}"
+    puts "Looking at message number #{index}" unless messages.size.zero?
     body = AwsCleaner.new.parse(message.body)
     id = message.receipt_handle
     now = Time.now.utc
@@ -67,18 +67,22 @@ loop do
     end
 
     @instance_id = AwsCleaner.new.process_message(body)
-    chef_node = AwsCleaner::Chef.get_chef_node_name(@instance_id, @config)
     elapsed_time = now - launch_time
     p "launch_time: #{launch_time}"
     p "now: #{now}"
-    # if the node exists in chef it hass bootstrapped
+    # if the node is no longer in aws we don't care anymore
+    # we can delete the message message
+    if !AwsWatcher::EC2.instance_alive?(@instance_id, @config)
+      p "instance: #{@instance_id} is not in aws anymore, removing message from queue"
+      AwsCleaner.new.delete_message(id, @config)
+    # if the node exists in chef it has bootstrapped
     # so we can delete the message
-    if chef_node || !AwsWatcher::EC2.instance_alive?(@instance_id, @config)
+    elsif AwsWatcher::Chef.registered?(@instance_id, @config)
       p "instance: #{@instance_id} has bootstrapped, removing message from queue"
       AwsCleaner.new.delete_message(id, @config)
-
+    else
+      p "instance: #{@instance_id}, launched: #{launch_time}, elapsed: #{elapsed_time} seconds"
     end
-    p "instance: #{@instance_id}, launched: #{launch_time}, elapsed: #{elapsed_time}"
     # if the elapsed time is less than how long we consider
     # a 'normal' converge time that's ok we just move on and
     # wait for another pass
@@ -96,9 +100,8 @@ loop do
       p 'node elaspsed time is too high'
       notification = "node: #{@instance_id} has not checked in, "
       notification += 'it should have converged by: '
-      notification += "#{@config[:bootstrap][:converged_by]} "
-      notification += 'and has been running since:and has been '
-      notification += "running since: #{elapsed_time}"
+      notification += "#{@config[:bootstrap][:converged_by]} seconds "
+      notification += "and has been running since: #{launch_time}"
       AwsCleaner::Notify.notify_chat(notification, @config)
     end
   end

data/lib/aws-watcher.rb

@@ -3,6 +3,15 @@ class AwsWatcher
   require 'aws_cleaner/aws_cleaner.rb'
   module Chef
     include AwsCleaner::Chef
+    def self.registered?(instance_id, config)
+      chef = AwsCleaner::Chef.client(config)
+      results = chef.search.query(:node, "ec2_instance_id:#{instance_id} OR chef_provisioning_reference_server_id:#{instance_id}")
+      if results.rows.empty?
+        false
+      else
+        true
+      end
+    end
   end
 
   module SQS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-watcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Abrams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler