mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 03:42:52 +09:00
(cherry picked from commit 98d5d3051c)
This commit is contained in:
1 parent
48e8e10971
commit
d3ed603012
3 files changed
+8
-1
No files matched your search
@@ -153,7 +153,11 @@ module OpenNebula
|
||||
@async = !options[:sync]
|
||||
|
||||
timeout=nil
|
||||
timeout=options[:timeout] if options[:timeout]
|
||||
if options[:timeout]
|
||||
timeout = options[:timeout]
|
||||
elsif ENV['ONE_XMLRPC_TIMEOUT']
|
||||
timeout = ENV['ONE_XMLRPC_TIMEOUT'].to_i
|
||||
end
|
||||
|
||||
http_proxy=nil
|
||||
http_proxy=options[:http_proxy] if options[:http_proxy]
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
# OpenNebula sever contact information
|
||||
#
|
||||
:one_xmlrpc: http://localhost:2633/RPC2
|
||||
:one_xmlrpc_timeout: 60
|
||||
|
||||
# Server Configuration
|
||||
#
|
||||
|
||||
@@ -109,6 +109,8 @@ rescue Exception => e
|
||||
exit 1
|
||||
end
|
||||
|
||||
ENV['ONE_XMLRPC_TIMEOUT'] = $conf[:one_xmlrpc_timeout].to_s unless ENV['ONE_XMLRPC_TIMEOUT']
|
||||
|
||||
$conf[:debug_level] ||= 3
|
||||
|
||||
# Set Sunstone Session Timeout
|
||||
|
||||
Reference in new issue
Block a user