Merge "[API] Fix exception when UPDATE gearman message fails"

This commit is contained in:
Jenkins
2013-11-19 15:52:09 +00:00
committed by Gerrit Code Review

View File

@@ -436,12 +436,17 @@ class GearmanClientThread(object):
else: else:
lb.status = 'ACTIVE' lb.status = 'ACTIVE'
lb.errmsg = None lb.errmsg = None
device = session.query(Device).\ device = session.query(Device).\
filter(Device.id == data).\ filter(Device.id == data).\
first() first()
device_name = device.name if device is None:
# Shouldn't hit here, but just to be safe
session.commit()
return
device_name = device.name
device_status = device.status
session.commit() session.commit()
if device.status == 'BUILD': if device_status == 'BUILD':
submit_vip_job( submit_vip_job(
'ASSIGN', device_name, None 'ASSIGN', device_name, None
) )