From b11b85a9f195e56e9c19579fbb4417ca6d98bdd0 Mon Sep 17 00:00:00 2001 From: PengfeiLi0218 Date: Thu, 31 Jan 2019 23:11:00 +0800 Subject: [PATCH] https://github.com/OpenBankProject/API-Manager/pull/67 user None exception in users\views --- apimanager/metrics/views.py | 67 +++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/apimanager/metrics/views.py b/apimanager/metrics/views.py index f942ede..08d27e5 100644 --- a/apimanager/metrics/views.py +++ b/apimanager/metrics/views.py @@ -145,8 +145,8 @@ class MetricsView(LoginRequiredMixin, TemplateView): error_once_only(self.request, err) except KeyError as err: error_once_only(self.request, metrics['message']) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) return metrics def get_context_data(self, **kwargs): @@ -264,8 +264,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): average_response_time = metrics[0]["average_response_time"] except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) else: urlpath = '/management/aggregate-metrics?from_date={}&to_date={}&exclude_app_names={}&exclude_implemented_by_partial_functions={}&exclude_url_pattern={}'.format( @@ -279,8 +279,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): average_response_time = metrics[0]["average_response_time"] except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) to_date = datetime.datetime.strptime(to_date, API_DATEFORMAT) @@ -307,7 +307,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): average_response_time = metrics[0]["average_response_time"] except APIError as err: error_once_only(self.request, err) - + except Exception as err: + error_once_only(self.request, "Unknown Error. {}".format(type(err).__name__)) to_date = datetime.datetime.strptime(to_date, API_DATEFORMAT) from_date = datetime.datetime.strptime(from_date, API_DATEFORMAT) @@ -328,8 +329,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): active_apps_list = list(apps) except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) else: urlpath = '/management/metrics/top-consumers?from_date={}&to_date={}&exclude_app_names={}&exclude_implemented_by_partial_functions={}&exclude_url_pattern={}'.format( from_date, to_date, ",".join(EXCLUDE_APPS), ",".join(EXCLUDE_FUNCTIONS), ",".join(EXCLUDE_URL_PATTERN)) @@ -339,8 +340,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): active_apps_list = list(apps) except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) return active_apps_list @@ -357,8 +358,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): apps_list = apps["list"] except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) for app in apps_list: app_created_date = datetime.datetime.strptime(app["created"], '%Y-%m-%dT%H:%M:%SZ') @@ -428,8 +429,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): sum += result except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) date_from = date_to date_list.append(date_from) @@ -447,8 +448,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): sum += result except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) date_from = date_to date_list.append(date_from) @@ -589,8 +590,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): users = api.get(urlpath) except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) else: try: @@ -602,8 +603,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): # fail gracefully in case API provides new structure except KeyError as err: messages.error(self.request, 'KeyError: {}'.format(err)) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) user_email_cansearchwarehouse = dict(zip(users_with_cansearchwarehouse, email_with_cansearchwarehouse)) number_of_users_with_cansearchwarehouse = len(user_email_cansearchwarehouse) @@ -619,8 +620,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): top_apis = api.get(urlpath)['top_apis'] except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) else: urlpath = '/management/metrics/top-apis?from_date={}&to_date={}&exclude_app_names={}&exclude_implemented_by_partial_functions={}&exclude_url_pattern={}'.format( from_date, to_date, ",".join(EXCLUDE_APPS), ",".join(EXCLUDE_FUNCTIONS), ",".join(EXCLUDE_URL_PATTERN)) @@ -629,8 +630,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): top_apis = api.get(urlpath)['top_apis'] except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) for api in top_apis: if api['Implemented_by_partial_function'] == "": @@ -652,8 +653,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): top_warehouse_calls.append(api) except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) return top_warehouse_calls def get_top_apps_using_warehouse(self, from_date, to_date): @@ -668,8 +669,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): top_apps_using_warehouse = top_apps_using_warehouse["top_consumers"][:2] except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) return top_apps_using_warehouse @@ -686,8 +687,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): apps_list = apps["list"] except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) for app in apps_list: created_date = datetime.datetime.strptime(app['created'], '%Y-%m-%dT%H:%M:%SZ') @@ -712,8 +713,8 @@ class MetricsSummaryView(LoginRequiredMixin, TemplateView): except APIError as err: error_once_only(self.request, err) - except: - error_once_only(self.request, 'Unknown Error') + except Exception as err: + error_once_only(self.request, 'Unknown Error. {}'.format(type(err).__name__)) if times_to_first_call: median = statistics.median(times_to_first_call)