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 #3180: add option to make xmlrpc calls synchronous

Browse Source 
Using SSL options in Ruby OCA no longer disable async calls automatically. The sync call
must be specified when creating a client:

client = OpenNebula::Client.new(secret, proxy, :sync => true)
This commit is contained in:
Javi Fontan 2014-10-21 11:45:56 +02:00
parent 6c9771c94e
commit 3d3a8d2487
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/oca/ruby/opennebula/client.rb
View File

@ -106,6 +106,14 @@ module OpenNebula
# defaults to 30
# @option params [String] :http_proxy HTTP proxy string used for
# connecting to the endpoint; defaults to no proxy
# @option params [Boolean] :sync Use only one http connection for
# all calls. It should not be used for multithreaded programs.
# It's the only mode that can be used with :cert_dir and
# :disable_ssl_verify
# @option params [String] :cert_dir Extra directory where to import
# trusted issuer certificates. Use with :sync = true
# @option params [String] :disable_ssl_verify Disable SSL certificate
# verification. Use only for testing and with :sync = true
#
# @return [OpenNebula::Client]
def initialize(secret=nil, endpoint=nil, options={})
@ -136,7 +144,7 @@ module OpenNebula
@one_endpoint = "http://localhost:2633/RPC2"
end
@async = true
@async = !options[:sync]
timeout=nil
timeout=options[:timeout] if options[:timeout]
@ -149,9 +157,10 @@ module OpenNebula
http = @server.instance_variable_get("@http")
if options['cert_dir'] || ENV['ONE_CERT_DIR']
@async = false
cert_dir = options['cert_dir'] || ENV['ONE_CERT_DIR']
if options[:cert_dir] || ENV['ONE_CERT_DIR']
STDERR.puts "SSL options don't work in async mode" if @async
cert_dir = options[:cert_dir] || ENV['ONE_CERT_DIR']
cert_files = Dir["#{cert_dir}/*"]
cert_store = OpenSSL::X509::Store.new
@ -161,8 +170,9 @@ module OpenNebula
http.cert_store = cert_store
end
if options['disable_ssl_verify'] || ENV['ONE_DISABLE_SSL_VERIFY']
@async = false
if options[:disable_ssl_verify] || ENV['ONE_DISABLE_SSL_VERIFY']
STDERR.puts "SSL options don't work in async mode" if @async
http.verify_mode = OpenSSL::SSL::VERIFY_NONE
end