From 29715a3d7e0be2b2962863ff44d368c86fe17e49 Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Mon, 21 Jul 2014 10:54:48 -0700 Subject: [PATCH] Revive the per-pool 'ok' JSON response until beaker can be patched --- lib/vmpooler/api.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/vmpooler/api.rb b/lib/vmpooler/api.rb index d137f86..9fbde20 100644 --- a/lib/vmpooler/api.rb +++ b/lib/vmpooler/api.rb @@ -191,6 +191,8 @@ module Vmpooler jdata.each do |template, count| result[template] ||= {} + result[template]['ok'] = true ## + count.to_i.times do |i| vm = $redis.spop('vmpooler__ready__'+template) @@ -200,6 +202,8 @@ module Vmpooler result[template] ||= {} + result[template]['ok'] = true ## + if ( result[template]['hostname'] ) result[template]['hostname'] = [result[template]['hostname']] if ! result[template]['hostname'].is_a?(Array) result[template]['hostname'].push(vm) @@ -207,6 +211,8 @@ module Vmpooler result[template]['hostname'] = vm end else + result[template]['ok'] = false ## + result['ok'] = false end end @@ -253,6 +259,8 @@ module Vmpooler params[:template].split('+').each do |template| result[template] ||= {} + result[template]['ok'] = true ## + vm = $redis.spop('vmpooler__ready__'+template) unless (vm.nil?) @@ -268,6 +276,8 @@ module Vmpooler result[template]['hostname'] = vm end else + result[template]['ok'] = false ## + result['ok'] = false end end