Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

Commit

Permalink
Bug 1101164 - Support gear registry with no web framework
Browse files Browse the repository at this point in the history
  • Loading branch information
jwhonce committed Jun 11, 2014
1 parent 12ac339 commit 08fced4
Showing 1 changed file with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1296,9 +1296,11 @@ def status(cart_name)

def generate_update_cluster_control_args(entries)
entries ||= gear_registry.entries
args = []
entries[:web].each_value do |entry|
args << "#{entry.dns}|#{entry.proxy_hostname}:#{entry.proxy_port}"
args = []
if entries.has_key?(:web)
entries[:web].each_value do |entry|
args << "#{entry.dns}|#{entry.proxy_hostname}:#{entry.proxy_port}"
end
end
args.join(' ')
end
Expand Down Expand Up @@ -1465,9 +1467,8 @@ def update_cluster(proxies, cluster, rollback, sync_new_gears)
@cartridge_model.do_control('update-cluster', proxy_cart, args: args)
rescue ::OpenShift::Runtime::Utils::ShellExecutionException => e
logger.info "BZ1025043: Gear #{self.uuid} - got exception running update-cluster for the proxy: #{e.message}"
logger.info "BZ1025043: Gear #{self.uuid} - directory listing of primary cartridge directory:"
listing, _, _ = Utils.oo_spawn("ls -laZ #{gear_env['OPENSHIFT_PRIMARY_CARTRIDGE_DIR']}/metadata")
logger.info "BZ1025043: Gear #{self.uuid} - #{listing}"
logger.info "BZ1025043: Gear #{self.uuid} - directory listing of primary cartridge directory:\n#{listing}"
raise
end
end
Expand Down

0 comments on commit 08fced4

Please sign in to comment.