From 8772a16ff5d0b8e4f18c65ed688c4badfcf60722 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Thu, 7 Jul 2011 13:39:32 +0200 Subject: [PATCH] feature #696: check for errors in info xmlrpc method --- src/acct/acctd.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/acct/acctd.rb b/src/acct/acctd.rb index 3264b50592..c2bb46d734 100755 --- a/src/acct/acctd.rb +++ b/src/acct/acctd.rb @@ -60,16 +60,24 @@ class Watcher @monitors.each do |monitor| if monitor[:steps] > 0 and step % monitor[:steps] == 0 monitor[:pools].each do |pool| + resource = monitor[:resource] + + log "#{resource.class}" + if pool_hash = @pool_cache[pool] else - pool.info + rc = pool.info + if OpenNebula.is_error?(rc) + log "Error: " + rc.message + log "Shutting down" + exit 1 + end + pool_hash = pool.to_hash @pool_cache[pool] = pool_hash end - resource = monitor[:resource] resource.insert(pool_hash) - log(resource) end end end