Merge "handling the exception in case no instanceusage with specific instance and launched_at is present" into stable

This commit is contained in:
Jenkins 2014-09-16 20:52:38 +00:00 committed by Gerrit Code Review
commit 00ed3daa0f

View File

@ -94,10 +94,14 @@ def _get_exists(beginning, ending):
def cell_and_compute(instance, launched_at):
usage = InstanceUsage.find(instance, launched_at)[0]
deployment = usage.latest_deployment_for_request_id()
usage_list = InstanceUsage.find(instance, launched_at)
deployment = None
usage = None
if usage_list:
usage = usage_list[0]
deployment = usage.latest_deployment_for_request_id()
cell = (deployment and deployment.name) or '-'
compute = usage.host() or '-'
compute = (usage and usage.host()) or '-'
return cell, compute