From 2fa7e1e73677eccb9459257e0d29ce1df9f1bead Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Wed, 25 Feb 2015 17:24:28 -0800 Subject: [PATCH] move 'content_type :json' to the beginning of endpoint defs --- lib/vmpooler/api.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/vmpooler/api.rb b/lib/vmpooler/api.rb index fbae20c..064d2c8 100644 --- a/lib/vmpooler/api.rb +++ b/lib/vmpooler/api.rb @@ -49,6 +49,8 @@ module Vmpooler end get '/dashboard/stats/vmpooler/pool/?' do + content_type :json + result = Hash.new $config[:pools].each do |pool| @@ -98,11 +100,12 @@ module Vmpooler end end - content_type :json JSON.pretty_generate(result) end get '/dashboard/stats/vmpooler/running/?' do + content_type :json + result = Hash.new $config[:pools].each do |pool| @@ -149,7 +152,6 @@ module Vmpooler end end - content_type :json JSON.pretty_generate(result) end @@ -230,6 +232,8 @@ module Vmpooler end get '/summary/?' do + content_type :json + result = { clone: { duration: { @@ -341,7 +345,6 @@ module Vmpooler result[:clone][:count][:average] = mean(total_clones_per_day) end - content_type :json JSON.pretty_generate(result) end