From 1f6777b16e7d71c9b03e1ce78f42fd1f5e395eec Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Thu, 6 Feb 2014 09:57:54 -0800 Subject: [PATCH] Revert "Report ok = 'false' if API DELETE fails" This reverts commit 616f3eb6f1d25c84315b7b00a09eb97aebd0c69f. --- vmware-host-pooler-api | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/vmware-host-pooler-api b/vmware-host-pooler-api index ec0a13b..f185cab 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 @@ -170,12 +170,10 @@ delete '/vm/:hostname' do 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 - else - result['ok'] = false end end + result['ok'] = true JSON.pretty_generate(result) end