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

Feature #4217: Minor bug in one/monitor

Browse Source
This commit is contained in:
Jaime Melis 2016-02-10 17:55:36 +01:00
parent fbf7e2cbe1
commit a1fab2a01b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/market_mad/remotes/one/monitor
View File

@ -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)