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

feature #967: Fix sync in CloudAuth

Browse Source
This commit is contained in:
Daniel Molina 2012-03-23 18:23:33 +01:00
parent b87cce74d9
commit 244afde3f9
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cloud/common/CloudAuth.rb
View File

@ -84,16 +84,16 @@ class CloudAuth
# ussername:: _String_ Name of the User
# [return] _Client_
def client(username=nil)
token = @lock.synchronize {
@server_auth.login_token(expiration_time,username)
}
@server_auth.login_token(expiration_time,username)
Client.new(token,@conf[:one_xmlrpc])
end
def update_userpool_cache
oneadmin_client = client
@lock.synchronize {
@user_pool = OpenNebula::UserPool.new(client)
@user_pool = OpenNebula::UserPool.new(oneadmin_client)
rc = @user_pool.info
raise rc.message if OpenNebula.is_error?(rc)
@ -114,13 +114,15 @@ class CloudAuth
protected
def expiration_time
time_now = Time.now.to_i
@lock.synchronize {
time_now = Time.now.to_i
if time_now > @token_expiration_time - EXPIRE_MARGIN
@token_expiration_time = time_now + EXPIRE_DELTA
end
if time_now > @token_expiration_time - EXPIRE_MARGIN
@token_expiration_time = time_now + EXPIRE_DELTA
end
@token_expiration_time
@token_expiration_time
}
end
def retrieve_from_userpool(xpath)