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

Wrap hostname-shortening into a [Sinatra helper] method

Browse source
This commit is contained in:
Scott Schneider 2014-11-03 13:07:22 -08:00
parent 4035114152
commit 489abd713a
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/vmpooler/api.rb
View file

@ -22,6 +22,16 @@ module Vmpooler
set :environment, 'production'
helpers do
def hostname_shorten hostname
if ( $config[:config]['domain'] and hostname =~ /^\w+\.#{$config[:config]['domain']}$/ )
hostname = hostname[/[^\.]+/]
end
hostname
end
end
get '/' do
erb :dashboard, locals: {
site_name: $config[:config]['site_name'] || '<b>vmpooler</b>',
@ -293,9 +303,7 @@ module Vmpooler
result['ok'] = false
if ( $config[:config]['domain'] and params[:hostname] =~ /^\w+\.#{$config[:config]['domain']}$/ )
params[:hostname] = params[:hostname][/[^\.]+/]
end
params[:hostname] = hostname_shorten(params[:hostname])
if $redis.exists('vmpooler__vm__'+params[:hostname])
result['ok'] = true
@ -321,9 +329,7 @@ module Vmpooler
result['ok'] = false
if ( $config[:config]['domain'] and params[:hostname] =~ /^\w+\.#{$config[:config]['domain']}$/ )
params[:hostname] = params[:hostname][/[^\.]+/]
end
params[:hostname] = hostname_shorten(params[:hostname])
$config[:pools].each do |pool|
if $redis.sismember('vmpooler__running__'+pool['name'], params[:hostname])
@ -343,9 +349,7 @@ module Vmpooler
result['ok'] = false
if ( $config[:config]['domain'] and params[:hostname] =~ /^\w+\.#{$config[:config]['domain']}$/ )
params[:hostname] = params[:hostname][/[^\.]+/]
end
params[:hostname] = hostname_shorten(params[:hostname])
if $redis.exists('vmpooler__vm__'+params[:hostname])
jdata = JSON.parse(request.body.read)