From 0b0b09cf4e142148e2f045f1e801895043b4e86e Mon Sep 17 00:00:00 2001 From: Alexander Tivelkov Date: Wed, 31 Jul 2013 20:00:27 +0400 Subject: [PATCH] Fixed a bug with error and warning state count Change-Id: I79495ecee3816737e9c31768af6c210906e136eb --- muranoapi/api/v1/deployments.py | 8 ++++++-- muranoapi/common/service.py | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/muranoapi/api/v1/deployments.py b/muranoapi/api/v1/deployments.py index 7d88234d..1c03728a 100644 --- a/muranoapi/api/v1/deployments.py +++ b/muranoapi/api/v1/deployments.py @@ -90,8 +90,12 @@ def create_resource(): def set_dep_state(deployment, unit): - num_errors = unit.query(Status).filter_by(level='error').count() - num_warnings = unit.query(Status).filter_by(level='warning').count() + num_errors = unit.query(Status).filter_by(level='error', + deployment_id=deployment.id). \ + count() + num_warnings = unit.query(Status).filter_by(level='warning', + deployment_id=deployment.id). \ + count() if deployment.finished: if num_errors: deployment.state = 'completed_w_errors' diff --git a/muranoapi/common/service.py b/muranoapi/common/service.py index 7796a5e8..546c6bcc 100644 --- a/muranoapi/common/service.py +++ b/muranoapi/common/service.py @@ -113,8 +113,12 @@ def handle_result(message): deployment = get_last_deployment(session, environment.id) deployment.finished = timeutils.utcnow() - num_errors = session.query(Status).filter_by(level='error').count() - num_warnings = session.query(Status).filter_by(level='warning').count() + num_errors = session.query(Status).filter_by(level='error', + deployment_id=deployment. + id).count() + num_warnings = session.query(Status).filter_by(level='warning', + deployment_id= + deployment.id).count() final_status_text = "Deployment finished" if num_errors: