opennebula 5.4.10 → 5.4.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c625fb9ba0d45b6b3d34ad13732d8208fdf2729c
4
- data.tar.gz: 013b0d58a162ea8573d634e7cc8340fbbd66e6ff
3
+ metadata.gz: 894d1decd54e49f00822cf9e93bf36fdcd8ed1f2
4
+ data.tar.gz: ddd312890220a5f79273980e1ccddffc439e5447
5
5
  SHA512:
6
- metadata.gz: 5c2da1a490b7b2297e5f1e85c478de998a048fba80d36ddd9321a543c2118c80afb78e455ac17f995e077ddeac099a65cc10f2a8d4c70eb21d96bbc27dfa1024
7
- data.tar.gz: 83a4da0b45711128489c41940b4a604a8b055953a887de77ca6b0799bdd84177e91151ab63ae3c067bf81db2e49cd831a742f57b3240f8c9408c01c37ce5032f
6
+ metadata.gz: 68cb2cbc1fe2ee8253dcac0ef5555b65ccbedfc3ece4453c58c493e53d763ad8b106e56b6438ca8433c49c4f321cc05762d7a7398009df16ae5ca848fa70dcfd
7
+ data.tar.gz: 14fbaefc00d2248b7c6f1be61d2e0159d75138c4e571799fd379e57593f2f998f9b59d2e8a38f8ee047bd13dbe9763eb91822f5e077af5a904c286398f11f418
data/lib/ActionManager.rb CHANGED
@@ -196,14 +196,16 @@ class ActionManager
196
196
 
197
197
  if action[:threaded]
198
198
  thread = Thread.new {
199
- action[:method].call(*action[:args])
200
-
201
- @threads_mutex.synchronize {
202
- @num_running -= 1
203
- delete_running_action(action[:id])
204
-
205
- @threads_cond.signal
206
- }
199
+ begin
200
+ action[:method].call(*action[:args])
201
+ ensure
202
+ @threads_mutex.synchronize {
203
+ @num_running -= 1
204
+ delete_running_action(action[:id])
205
+
206
+ @threads_cond.signal
207
+ }
208
+ end
207
209
  }
208
210
 
209
211
  action[:thread] = thread
@@ -50,7 +50,7 @@ end
50
50
  module CloudClient
51
51
 
52
52
  # OpenNebula version
53
- VERSION = '5.4.10'
53
+ VERSION = '5.4.11'
54
54
 
55
55
  # #########################################################################
56
56
  # Default location for the authentication file
data/lib/opennebula.rb CHANGED
@@ -69,5 +69,5 @@ require 'opennebula/vm_group_pool'
69
69
  module OpenNebula
70
70
 
71
71
  # OpenNebula version
72
- VERSION = '5.4.10'
72
+ VERSION = '5.4.11'
73
73
  end
@@ -153,7 +153,11 @@ module OpenNebula
153
153
  @async = !options[:sync]
154
154
 
155
155
  timeout=nil
156
- timeout=options[:timeout] if options[:timeout]
156
+ if options[:timeout]
157
+ timeout = options[:timeout]
158
+ elsif ENV['ONE_XMLRPC_TIMEOUT']
159
+ timeout = ENV['ONE_XMLRPC_TIMEOUT'].to_i
160
+ end
157
161
 
158
162
  http_proxy=nil
159
163
  http_proxy=options[:http_proxy] if options[:http_proxy]
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opennebula
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.4.10
4
+ version: 5.4.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenNebula
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-03 00:00:00.000000000 Z
11
+ date: 2018-04-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nokogiri