shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

feature #1265: Warning when using server instead of host in econe

Browse Source
This commit is contained in:
Daniel Molina 2012-05-10 14:49:34 +02:00
parent a3d7888c32
commit d3b624d4a6
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cloud/ec2/etc/econe.conf
View File

@ -25,7 +25,7 @@
:one_xmlrpc: http://localhost:2633/RPC2
# Host and port where econe server will run
:server: localhost
:host: localhost
:port: 4567
# SSL proxy that serves the API (set if is being used)

11
src/cloud/ec2/lib/econe-server.rb
View File

@ -79,7 +79,14 @@ set :config, conf
include CloudLogger
enable_logging EC2_LOG, settings.config[:debug_level].to_i
if CloudServer.is_port_open?(settings.config[:server],
if settings.config[:server]
settings.config[:host] ||= settings.config[:server]
warning = "Warning: :server: configuration parameter has been deprecated."
warning << " Use :host: instead."
settings.logger.warn warning
end
if CloudServer.is_port_open?(settings.config[:host],
settings.config[:port])
settings.logger.error {
"Port #{settings.config[:port]} busy, please shutdown " <<
@ -88,7 +95,7 @@ if CloudServer.is_port_open?(settings.config[:server],
exit -1
end
set :bind, settings.config[:server]
set :bind, settings.config[:host]
set :port, settings.config[:port]
begin

21
src/cloud/occi/lib/occi-server.rb
View File

@ -92,7 +92,14 @@ use Rack::Session::Pool, :key => 'occi'
set :public_folder, Proc.new { File.join(root, "ui/public") }
set :views, settings.root + '/ui/views'
if CloudServer.is_port_open?(settings.config[:server],
if settings.config[:server]
settings.config[:host] ||= settings.config[:server]
warning = "Warning: :server: configuration parameter has been deprecated."
warning << " Use :host: instead."
settings.logger.warn warning
end
if CloudServer.is_port_open?(settings.config[:host],
settings.config[:port])
settings.logger.error {
"Port #{settings.config[:port]} busy, please shutdown " <<
@ -101,20 +108,10 @@ if CloudServer.is_port_open?(settings.config[:server],
exit -1
end
host = settings.config[:host] || settings.config[:server]
set :bind, host
if settings.config[:server]
warning = "Warning: :server: configuration parameter has been deprecated."
warning << " Use :host: instead."
settings.logger.error warning
end
set :bind, settings.config[:host]
set :port, settings.config[:port]
# Create CloudAuth
begin
ENV["ONE_CIPHER_AUTH"] = OCCI_AUTH