From d7c427239455d7f12b3b31131c6147dc9e2c4548 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 29 Jul 2011 15:49:55 +0200
Subject: [PATCH] watcher: Make RAPI error messages less technical
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/watcher/__init__.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index 23047df97..1dee4f390 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -401,13 +401,14 @@ def IsRapiResponding(hostname):
try:
master_version = rapi_client.GetVersion()
except rapi.client.CertificateError, err:
- logging.warning("RAPI Error: CertificateError (%s)", err)
+ logging.warning("RAPI certificate error: %s", err)
return False
except rapi.client.GanetiApiError, err:
- logging.warning("RAPI Error: GanetiApiError (%s)", err)
+ logging.warning("RAPI error: %s", err)
return False
- logging.debug("RAPI Result: master_version is %s", master_version)
- return master_version == constants.RAPI_VERSION
+ else:
+ logging.debug("Reported RAPI version %s", master_version)
+ return master_version == constants.RAPI_VERSION
def ParseOptions():
--
GitLab