From 67e76d771709c231eae1b85d931004b5dee4a891 Mon Sep 17 00:00:00 2001 From: Alain Takoudjou <alain.takoudjou@nexedi.com> Date: Tue, 29 Mar 2016 15:13:23 +0200 Subject: [PATCH] monitor: fix check of valid monitor URL --- stack/monitor/buildout.cfg | 2 +- stack/monitor/scripts/monitor.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/stack/monitor/buildout.cfg b/stack/monitor/buildout.cfg index eafe02005..ac24297dd 100644 --- a/stack/monitor/buildout.cfg +++ b/stack/monitor/buildout.cfg @@ -120,7 +120,7 @@ context = [monitor2-bin] <= monitor-template-script filename = monitor.py -md5sum = 927501a8c4ce8dcc39d55af1efdc66ed +md5sum = 222365a469f8ab08a0367d81c0b03982 [run-promise-py] recipe = slapos.recipe.template:jinja2 diff --git a/stack/monitor/scripts/monitor.py b/stack/monitor/scripts/monitor.py index e2625aba7..d0d5daa50 100644 --- a/stack/monitor/scripts/monitor.py +++ b/stack/monitor/scripts/monitor.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- import sys import os @@ -220,7 +221,7 @@ class Monitoring(object): def getMonitorTitleFromUrl(self, monitor_url): # This file should be generated - if not monitor_url.startswith('https://') or not monitor_url.startswith('http://'): + if not monitor_url.startswith('https://') and not monitor_url.startswith('http://'): return 'Unknow Instance' if not monitor_url.endswith('/'): monitor_url = monitor_url + '/' -- 2.30.9