You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2013/02/20 19:57:31 UTC
[4/4] git commit: Make configured frontends available as method on
Deltacloud
Updated Branches:
refs/heads/master 324ef9535 -> d3e2719eb
Make configured frontends available as method on Deltacloud
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/c6f9c28f
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/c6f9c28f
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/c6f9c28f
Branch: refs/heads/master
Commit: c6f9c28f97bb0ad827a5d745f8a00b7ae4b29235
Parents: 324ef95
Author: David Lutterkort <lu...@redhat.com>
Authored: Tue Feb 19 20:40:42 2013 -0800
Committer: David Lutterkort <lu...@redhat.com>
Committed: Wed Feb 20 10:57:06 2013 -0800
----------------------------------------------------------------------
server/config.ru | 2 +-
server/lib/deltacloud_rack.rb | 7 ++++++-
server/lib/initializers/frontend_initialize.rb | 7 -------
3 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c6f9c28f/server/config.ru
----------------------------------------------------------------------
diff --git a/server/config.ru b/server/config.ru
index 305ab4b..945674b 100644
--- a/server/config.ru
+++ b/server/config.ru
@@ -35,7 +35,7 @@ static_files = {
# The 'generate_routes_for' also require the frontend
# servers and all dependencies.
#
-routes = Deltacloud.generate_routes_for(frontends)
+routes = Deltacloud.generate_routes
run Rack::Builder.new {
use Rack::MatrixParams
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c6f9c28f/server/lib/deltacloud_rack.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud_rack.rb b/server/lib/deltacloud_rack.rb
index f656d1d..32ff4e8 100644
--- a/server/lib/deltacloud_rack.rb
+++ b/server/lib/deltacloud_rack.rb
@@ -57,7 +57,7 @@ module Deltacloud
@default_frontend || config[:deltacloud]
end
- def self.generate_routes_for(frontends)
+ def self.generate_routes
frontends.inject({}) do |result, frontend|
frontend = frontend.strip
if Deltacloud[frontend.to_sym].nil?
@@ -70,6 +70,11 @@ module Deltacloud
end
end
+ def self.frontends
+ ENV['API_FRONTEND'] ||= 'deltacloud'
+ ENV['API_FRONTEND'].split(',')
+ end
+
require 'sinatra/base'
require_relative './deltacloud/helpers/deltacloud_helper'
require_relative './sinatra/rack_accept'
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c6f9c28f/server/lib/initializers/frontend_initialize.rb
----------------------------------------------------------------------
diff --git a/server/lib/initializers/frontend_initialize.rb b/server/lib/initializers/frontend_initialize.rb
index bfa1871..e3f3228 100644
--- a/server/lib/initializers/frontend_initialize.rb
+++ b/server/lib/initializers/frontend_initialize.rb
@@ -23,13 +23,6 @@ require_relative './../deltacloud_rack'
# This will configure the URL mapping, verions and different servers
# that multiple frontends require. You might not need to change this :)
-
-def frontends
- ENV['API_FRONTEND'] ||= 'deltacloud'
- ENV['API_FRONTEND'].split(',').size > 1 ?
- ENV['API_FRONTEND'].split(',') : [ENV['API_FRONTEND']]
-end
-
Deltacloud::configure do |server|
server.root_url '/api'
server.version Deltacloud::API_VERSION