From 06bdc27ca87e229d7db9f8310493bc184f28d107 Mon Sep 17 00:00:00 2001
From: Gavin Williams <fatmcgav@gmail.com>
Date: Tue, 31 Mar 2015 17:18:03 +0100
Subject: [PATCH 1/2] Clean up VM's that have been removed from VMware
 inventory outside of vmpooler. Fixes #80

---
 lib/vmpooler/pool_manager.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index b6f7ee8..9fd34b9 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -337,6 +337,10 @@ module Vmpooler
                 check_ready_vm(vm, pool['name'], pool['ready_ttl'] || 0)
               rescue
               end
+            else
+              $logger.log('d', "[*] [#{pool['name']}] vm #{vm} is not in inventory, removing from 'ready' queue")
+              $redis.srem('vmpooler__ready__' + pool['name'], vm)
+              $redis.del('vmpooler__vm__' + vm)
             end
           end
 
@@ -355,6 +359,10 @@ module Vmpooler
                 check_pending_vm(vm, pool['name'], pool['timeout'])
               rescue
               end
+            else
+              $logger.log('d', "[*] [#{pool['name']}] #{vm} not in inventory, removing from 'pending' queue")
+              $redis.srem('vmpooler__pending__' + pool['name'], vm)
+              $redis.del('vmpooler__vm__' + vm)
             end
           end
 

From abb3076998a96996717217f570a3744e20b0e5aa Mon Sep 17 00:00:00 2001
From: Gavin Williams <fatmcgav@gmail.com>
Date: Wed, 8 Apr 2015 15:42:48 +0100
Subject: [PATCH 2/2] Change log lines when removing VM's no longer in
 inventory

---
 lib/vmpooler/pool_manager.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index 9fd34b9..52e95b0 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -338,7 +338,7 @@ module Vmpooler
               rescue
               end
             else
-              $logger.log('d', "[*] [#{pool['name']}] vm #{vm} is not in inventory, removing from 'ready' queue")
+              $logger.log('d', "[!] [#{pool['name']}] '#{vm}' is not in inventory, removing from 'ready' queue")
               $redis.srem('vmpooler__ready__' + pool['name'], vm)
               $redis.del('vmpooler__vm__' + vm)
             end
@@ -360,7 +360,7 @@ module Vmpooler
               rescue
               end
             else
-              $logger.log('d', "[*] [#{pool['name']}] #{vm} not in inventory, removing from 'pending' queue")
+              $logger.log('d', "[!] [#{pool['name']}] '#{vm}' not in inventory, removing from 'pending' queue")
               $redis.srem('vmpooler__pending__' + pool['name'], vm)
               $redis.del('vmpooler__vm__' + vm)
             end