From 9dfc20902cd1fbf264d02a7276060d304ec31037 Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Thu, 6 Feb 2014 09:59:21 -0800 Subject: [PATCH] Report ok = 'false' if API DELETE fails --- vmware-host-pooler-api | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/vmware-host-pooler-api b/vmware-host-pooler-api index f185cab..49d2bde 100755 --- a/vmware-host-pooler-api +++ b/vmware-host-pooler-api @@ -55,7 +55,7 @@ get '/dashboard/stats/vcloud/numbers' do result['total'] = result['pending'].to_i + result['ready'].to_i + result['running'].to_i + result['completed'].to_i content_type :json - JSON.pretty_generate( result ) + JSON.pretty_generate(result) end get '/dashboard/stats/vcloud/pool' do @@ -107,7 +107,7 @@ get '/dashboard/stats/vcloud/pool' do end content_type :json - JSON.pretty_generate( result ) + JSON.pretty_generate(result) end get '/status' do @@ -166,14 +166,16 @@ delete '/vm/:hostname' do result = {} + result['ok'] = false + pools.each do |pool| if $redis.sismember('vmware_host_pool__running__'+pool['name'], params[:hostname]) $redis.srem('vmware_host_pool__running__'+pool['name'], params[:hostname]) $redis.sadd('vmware_host_pool__completed__'+pool['name'], params[:hostname]) + result['ok'] = true end end - result['ok'] = true JSON.pretty_generate(result) end