From 0b68fcbf0aa925efb26627bf147bcf7f00ac55fe Mon Sep 17 00:00:00 2001 From: tierno Date: Fri, 14 Aug 2020 10:05:43 +0000 Subject: [PATCH] k8s_helm log enhancement avoid repetition of logs. Remove unneded traceback Change-Id: Idcbdec0ea137e1daf6a8340f47e123849b585118 Signed-off-by: tierno --- n2vc/k8s_helm_conn.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/n2vc/k8s_helm_conn.py b/n2vc/k8s_helm_conn.py index ad9d9d0..13a69c4 100644 --- a/n2vc/k8s_helm_conn.py +++ b/n2vc/k8s_helm_conn.py @@ -898,7 +898,7 @@ class K8sHelmConnector(K8sConnector): async def synchronize_repos(self, cluster_uuid: str): _, cluster_id = self._get_namespace_cluster_id(cluster_uuid) - self.log.debug("syncronize repos for cluster helm-id: {}",) + self.log.debug("syncronize repos for cluster helm-id: {}".format(cluster_id)) try: update_repos_timeout = ( 300 # max timeout to sync a single repos, more than this is too much @@ -916,8 +916,8 @@ class K8sHelmConnector(K8sConnector): # elements that must be deleted deleted_repo_list = [] added_repo_dict = {} - self.log.debug("helm_chart_repos: {}".format(nbi_repo_list)) - self.log.debug("helm_charts_added: {}".format(cluster_repo_dict)) + # self.log.debug("helm_chart_repos: {}".format(nbi_repo_list)) + # self.log.debug("helm_charts_added: {}".format(cluster_repo_dict)) # obtain repos to add: registered by nbi but not added repos_to_add = [ @@ -934,7 +934,8 @@ class K8sHelmConnector(K8sConnector): # delete repos: must delete first then add because there may be # different repos with same name but # different id and url - self.log.debug("repos to delete: {}".format(repos_to_delete)) + if repos_to_delete: + self.log.debug("repos to delete: {}".format(repos_to_delete)) for repo_id in repos_to_delete: # try to delete repos try: @@ -957,7 +958,8 @@ class K8sHelmConnector(K8sConnector): deleted_repo_list.append(repo_id) # add repos - self.log.debug("repos to add: {}".format(repos_to_add)) + if repos_to_add: + self.log.debug("repos to add: {}".format(repos_to_add)) for repo_id in repos_to_add: # obtain the repo data from the db # if there is an error getting the repo in the database we will @@ -1136,6 +1138,7 @@ class K8sHelmConnector(K8sConnector): db_dict: dict = None, run_once: bool = False, ): + previous_exception = None while True: try: await asyncio.sleep(check_every) @@ -1159,8 +1162,10 @@ class K8sHelmConnector(K8sConnector): self.log.debug("Task cancelled") return except Exception as e: - self.log.debug("_store_status exception: {}".format(str(e)), exc_info=True) - pass + # log only once in the while loop + if str(previous_exception) != str(e): + self.log.debug("_store_status exception: {}".format(str(e))) + previous_exception = e finally: if run_once: return -- 2.25.1