From c85081c77f79b8451f010522acfd67bdee7631fd Mon Sep 17 00:00:00 2001 From: Andrey Vertiprahov Date: Wed, 29 May 2019 18:32:15 +0500 Subject: [PATCH] Add ingnore_errors param to http_get activator method. --- core/profile/checker.py | 2 +- services/activator/api/activator.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/profile/checker.py b/core/profile/checker.py index 5c6a5863a6..b891786fb2 100644 --- a/core/profile/checker.py +++ b/core/profile/checker.py @@ -279,7 +279,7 @@ class ProfileChecker(object): "activator", pool=self.pool, calling_service=self.calling_service - ).http_get(url) + ).http_get(url, ignore_errors=True) except RPCError as e: self.logger.error("RPC Error: %s", e) return None diff --git a/services/activator/api/activator.py b/services/activator/api/activator.py index c056ca1d99..153fb18741 100644 --- a/services/activator/api/activator.py +++ b/services/activator/api/activator.py @@ -155,10 +155,11 @@ class ActivatorAPI(API): @api @tornado.gen.coroutine - def http_get(self, url): + def http_get(self, url, ingnore_errors=False): """ Perform HTTP/HTTPS get and return result :param url: Request URL + :param ingnore_errors: :returns" Result as a string, or None in case of errors """ self.logger.debug("HTTP GET %s", url) @@ -171,6 +172,10 @@ class ActivatorAPI(API): ) if 200 <= code <= 299: raise tornado.gen.Return(body) + elif ingnore_errors: + metrics["error", ("type", "http_error_%s" % code)] += 1 + self.logger.debug("HTTP GET %s failed: %s %s", url, code, body) + raise tornado.gen.Return(str(header) + str(body)) else: metrics["error", ("type", "http_error_%s" % code)] += 1 self.logger.debug("HTTP GET %s failed: %s %s", url, code, body) -- GitLab