From e6b6086e3136218ec4d943581998c42e55818f2f Mon Sep 17 00:00:00 2001 From: Oleksii Kliukin Date: Mon, 23 Nov 2015 12:44:38 +0100 Subject: [PATCH 1/3] Avoid excessive log output in the API thread. Set log level for BaseHTTPRequestHandler request logging to debug. Avoid complains about PostgreSQL being unreachable if we know it is not running. --- patroni/api.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/patroni/api.py b/patroni/api.py index 466d7e32..40a6fcab 100644 --- a/patroni/api.py +++ b/patroni/api.py @@ -243,13 +243,17 @@ class RestApiHandler(BaseHTTPRequestHandler): except (psycopg2.Error, RetryFailedError, PostgresConnectionException): state = self.server.patroni.postgresql.state if state in ['stopped', 'starting', 'stopping', 'restarting', 'running']: - logger.exception('get_postgresql_status') + if state == 'running': + logger.exception('get_postgresql_status') state = 'unknown' if state == 'running' else state return {'state': state} def get_tags(self): return {'tags': self.server.patroni.tags} + def log_message(self, format, *args): + logger.debug("API thread: "+format % args) + class RestApiServer(ThreadingMixIn, HTTPServer, Thread): From e3961ee70bdaa4fe49601d282d1376299294a75c Mon Sep 17 00:00:00 2001 From: Oleksii Kliukin Date: Mon, 23 Nov 2015 12:59:01 +0100 Subject: [PATCH 2/3] Simplify the condition when handling postgresql status request failures. --- patroni/api.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/patroni/api.py b/patroni/api.py index 40a6fcab..fd09e06c 100644 --- a/patroni/api.py +++ b/patroni/api.py @@ -242,10 +242,9 @@ class RestApiHandler(BaseHTTPRequestHandler): } except (psycopg2.Error, RetryFailedError, PostgresConnectionException): state = self.server.patroni.postgresql.state - if state in ['stopped', 'starting', 'stopping', 'restarting', 'running']: - if state == 'running': - logger.exception('get_postgresql_status') - state = 'unknown' if state == 'running' else state + if state == 'running': + logger.exception('get_postgresql_status') + state = 'unknown' return {'state': state} def get_tags(self): From 58d1a8a86998e6b4542abcf91f231657a1dc7686 Mon Sep 17 00:00:00 2001 From: Oleksii Kliukin Date: Mon, 23 Nov 2015 15:38:50 +0100 Subject: [PATCH 3/3] Add missing whitespaces --- patroni/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patroni/api.py b/patroni/api.py index fd09e06c..47416b10 100644 --- a/patroni/api.py +++ b/patroni/api.py @@ -251,7 +251,7 @@ class RestApiHandler(BaseHTTPRequestHandler): return {'tags': self.server.patroni.tags} def log_message(self, format, *args): - logger.debug("API thread: "+format % args) + logger.debug("API thread: " + format % args) class RestApiServer(ThreadingMixIn, HTTPServer, Thread):