From a1fab2a01b4848778b9ab36c611fc287a2d8f74c Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Wed, 10 Feb 2016 17:55:36 +0100 Subject: [PATCH] Feature #4217: Minor bug in one/monitor --- src/market_mad/remotes/one/monitor | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/market_mad/remotes/one/monitor b/src/market_mad/remotes/one/monitor index c27ff17800..158eddf366 100755 --- a/src/market_mad/remotes/one/monitor +++ b/src/market_mad/remotes/one/monitor @@ -27,8 +27,8 @@ class OneMarket AGENT = 'Market Driver' VERSION = File.dirname(__FILE__) + '/../../VERSION' - def initialize(url=ONE_MARKET_URL) - @url = url + def initialize(url) + @url = url || ONE_MARKET_URL @agent = "OpenNebula #{File.read(VERSION)} (#{AGENT})" end @@ -145,9 +145,12 @@ end # Main Program. Outpust the list of marketplace appliances ################################################################################ -drv_message = Base64::decode64(ARGV[0]) -doc = REXML::Document.new(drv_message).root -url = doc.elements['MARKETPLACE/TEMPLATE/ENDPOINT'].text rescue nil +begin + drv_message = Base64::decode64(ARGV[0]) + doc = REXML::Document.new(drv_message).root + url = doc.elements['MARKETPLACE/TEMPLATE/ENDPOINT'].text rescue nil +rescue Exception +end #TODO get marketplace URL from MARKETPLACE Templace for other markets one_market = OneMarket.new(url)