From 68cfaa17300eaf4ba89d6b92c1ca41357a5849ff Mon Sep 17 00:00:00 2001 From: Timur Sufiev Date: Wed, 28 Aug 2013 18:52:58 +0400 Subject: [PATCH] Again change service log ordering: older - first (as in deployment logs). Change-Id: Id7b215a610c0c3375055fb1ff7c75e384fab2d3a Fixes: bug MRN-884. --- muranodashboard/panel/api.py | 4 ++-- muranodashboard/services/MsSqlClusterServer.yaml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/muranodashboard/panel/api.py b/muranodashboard/panel/api.py index 66c5f4d46..d1a25fefb 100644 --- a/muranodashboard/panel/api.py +++ b/muranodashboard/panel/api.py @@ -58,12 +58,12 @@ def get_status_messages_for_service(request, service_id, environment_id): result = '\n' #TODO: Add updated time to logs if deployments: - for deployment in deployments: + for deployment in reversed(deployments): reports = muranoclient(request).deployments.reports(environment_id, deployment.id, service_id) - for report in reversed(reports): + for report in reports: result += report.created.replace('T', ' ') + ' - ' + str( report.text) + '\n' return result diff --git a/muranodashboard/services/MsSqlClusterServer.yaml b/muranodashboard/services/MsSqlClusterServer.yaml index 4522a19f3..523b84007 100644 --- a/muranodashboard/services/MsSqlClusterServer.yaml +++ b/muranodashboard/services/MsSqlClusterServer.yaml @@ -156,6 +156,9 @@ forms: # if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern - expr: {YAQL: not $.clusterConfiguration.unitNamingPattern.bool() or '#' in $.clusterConfiguration.unitNamingPattern} message: Incrementation symbol "#" is required in the Hostname template + # if IP is not valid on its own, it will be empty - the + # first check is needed to not emit comparison error when + # both IPs are not valid - expr: {YAQL: $.clusterConfiguration.clusterIP.bool() and $.clusterConfiguration.clusterIP != $.clusterConfiguration.agListenerIP} message: Listener IP and Cluster Static IP should be different - unitsConfiguration: