puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-27 02:18:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Syntax clean-up

Browse source
This commit is contained in:
Scott Schneider 2015-04-17 09:16:37 -07:00
parent 9897a9add1
commit 69ea4972e6
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/vmpooler/api/v1.rb
View file

@ -176,10 +176,9 @@ module Vmpooler
get "#{api_prefix}/token/:token/?" do get "#{api_prefix}/token/:token/?" do
content_type :json content_type :json
result = {} result = { 'ok' => false }
Vmpooler::API.settings.config[:auth] ? status(401) : status(404) Vmpooler::API.settings.config[:auth] ? status(401) : status(404)
result['ok'] = false
if Vmpooler::API.settings.config[:auth] and Vmpooler::API.settings.redis.exists('vmpooler__token__' + params[:token]) if Vmpooler::API.settings.config[:auth] and Vmpooler::API.settings.redis.exists('vmpooler__token__' + params[:token])
status(200) status(200)
@ -194,10 +193,9 @@ module Vmpooler
delete "#{api_prefix}/token/:token/?" do delete "#{api_prefix}/token/:token/?" do
content_type :json content_type :json
result = {} result = { 'ok' => false }
Vmpooler::API.settings.config[:auth] ? status(401) : status(404) Vmpooler::API.settings.config[:auth] ? status(401) : status(404)
result['ok'] = false
if Vmpooler::API.settings.config[:auth] and Vmpooler::API.settings.redis.exists('vmpooler__token__' + params[:token]) if Vmpooler::API.settings.config[:auth] and Vmpooler::API.settings.redis.exists('vmpooler__token__' + params[:token])
status(200) status(200)
@ -212,10 +210,9 @@ module Vmpooler
post "#{api_prefix}/token" do post "#{api_prefix}/token" do
content_type :json content_type :json
result = {} result = { 'ok' => false }
Vmpooler::API.settings.config[:auth] ? status(401) : status(404) Vmpooler::API.settings.config[:auth] ? status(401) : status(404)
result['ok'] = false
jdata = JSON.parse(request.body.read) jdata = JSON.parse(request.body.read)
@ -376,10 +373,9 @@ module Vmpooler
get "#{api_prefix}/vm/:hostname/?" do get "#{api_prefix}/vm/:hostname/?" do
content_type :json content_type :json
result = {} result = { 'ok' => false }
status(404) status(404)
result['ok'] = false
params[:hostname] = hostname_shorten(params[:hostname], Vmpooler::API.settings.config[:config]['domain']) params[:hostname] = hostname_shorten(params[:hostname], Vmpooler::API.settings.config[:config]['domain'])
@ -418,10 +414,9 @@ module Vmpooler
delete "#{api_prefix}/vm/:hostname/?" do delete "#{api_prefix}/vm/:hostname/?" do
content_type :json content_type :json
result = {} result = { 'ok' => false }
status(404) status(404)
result['ok'] = false
params[:hostname] = hostname_shorten(params[:hostname], Vmpooler::API.settings.config[:config]['domain']) params[:hostname] = hostname_shorten(params[:hostname], Vmpooler::API.settings.config[:config]['domain'])
@ -443,10 +438,9 @@ module Vmpooler
failure = false failure = false
result = {} result = { 'ok' => false }
status(404) status(404)
result['ok'] = false
params[:hostname] = hostname_shorten(params[:hostname], Vmpooler::API.settings.config[:config]['domain']) params[:hostname] = hostname_shorten(params[:hostname], Vmpooler::API.settings.config[:config]['domain'])