From 83a3eb0f118399325e23afb9019a3c5d765e82f1 Mon Sep 17 00:00:00 2001 From: MementoMori <1003350679@qq.com> Date: Thu, 3 Sep 2020 10:28:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=9A=84log=5Flevel?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=B8=8D=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageship/packageship/application/__init__.py | 4 ++-- packageship/packageship/libs/log/loghelper.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packageship/packageship/application/__init__.py b/packageship/packageship/application/__init__.py index 810d6ce5..0ca16e9d 100644 --- a/packageship/packageship/application/__init__.py +++ b/packageship/packageship/application/__init__.py @@ -47,11 +47,11 @@ def init_app(operation): app = Flask(__name__) # log configuration - setup_log(Config) + app.logger.addHandler(setup_log(Config)) # Load configuration items - app.config.from_object(Config) + app.config.from_object(Config()) # Register a scheduled task scheduler = APScheduler() diff --git a/packageship/packageship/libs/log/loghelper.py b/packageship/packageship/libs/log/loghelper.py index fc53bb21..624227c6 100644 --- a/packageship/packageship/libs/log/loghelper.py +++ b/packageship/packageship/libs/log/loghelper.py @@ -52,7 +52,7 @@ def setup_log(config=None): file_log_handler.setFormatter(formatter) - logging.getLogger().addHandler(file_log_handler) + return file_log_handler class Log(): -- Gitee From 6557bee868d1f8da1c16e89b986c6de572be7144 Mon Sep 17 00:00:00 2001 From: MementoMori <1003350679@qq.com> Date: Thu, 3 Sep 2020 16:25:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9C=A8=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=A4=B1=E8=B4=A5=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=88=90lifecycle.db=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2pkgshi?= =?UTF-8?q?p=20issue=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/apps/lifecycle/view.py | 18 ++++++++++-------- .../application/initsystem/data_import.py | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packageship/packageship/application/apps/lifecycle/view.py b/packageship/packageship/application/apps/lifecycle/view.py index efce4bb4..837b5c7f 100644 --- a/packageship/packageship/application/apps/lifecycle/view.py +++ b/packageship/packageship/application/apps/lifecycle/view.py @@ -304,7 +304,7 @@ class IssueView(Resource): return issue_data except (SQLAlchemyError, DisconnectionError) as error: current_app.logger.error(error) - return [] + return ResponseCode.response_json(ResponseCode.DATABASE_NOT_FOUND) def get(self): """ @@ -350,10 +350,12 @@ class IssueType(Resource): with DBHelper(db_name='lifecycle') as database: issues_query = database.session.query(PackagesIssue.issue_type).group_by( PackagesIssue.issue_type).all() - return [issue_query[0] for issue_query in issues_query] + return jsonify(ResponseCode.response_json( + ResponseCode.SUCCESS, [issue_query[0] for issue_query in issues_query])) except (SQLAlchemyError, DisconnectionError) as error: current_app.logger.error(error) - return [] + return jsonify(ResponseCode.response_json( + ResponseCode.PARAM_ERROR)) def get(self): """ @@ -370,9 +372,7 @@ class IssueType(Resource): TypeError: Exception of type Error: Abnormal error """ - issue_dict = self._get_issue_type() - return jsonify(ResponseCode.response_json( - ResponseCode.SUCCESS, issue_dict)) + return self._get_issue_type() class IssueStatus(Resource): @@ -389,10 +389,12 @@ class IssueStatus(Resource): with DBHelper(db_name='lifecycle') as database: issues_query = database.session.query(PackagesIssue.issue_status).group_by( PackagesIssue.issue_status).all() - return [issue_query[0] for issue_query in issues_query] + return jsonify(ResponseCode.response_json( + ResponseCode.SUCCESS, [issue_query[0] for issue_query in issues_query])) except (SQLAlchemyError, DisconnectionError) as error: current_app.logger.error(error) - return [] + return jsonify(ResponseCode.response_json( + ResponseCode.PARAM_ERROR)) def get(self): """ diff --git a/packageship/packageship/application/initsystem/data_import.py b/packageship/packageship/application/initsystem/data_import.py index 1fda79f0..8ea467f5 100644 --- a/packageship/packageship/application/initsystem/data_import.py +++ b/packageship/packageship/application/initsystem/data_import.py @@ -287,7 +287,7 @@ class InitDataBase(): db_name, table_name, lifecycle_status_val) self._save_src_requires(db_name) - with DBHelper(db_name=bin_db_file, db_type='sqlite:///', complete_route_db=True)\ + with DBHelper(db_name=bin_db_file, db_type='sqlite:///', complete_route_db=True) \ as database: self._database = database # Save binary package related data @@ -676,7 +676,7 @@ class SqliteDatabaseOperations(): database_file_folder: Database folder path """ - def __init__(self, db_name, tables=None, storage=False, ** kwargs): + def __init__(self, db_name, tables=None, storage=False, **kwargs): """ Class instance initialization -- Gitee From 421565e077998e84d0ae2b9b9a07a062d5c83987 Mon Sep 17 00:00:00 2001 From: MementoMori <1003350679@qq.com> Date: Thu, 3 Sep 2020 16:58:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9C=A8=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=A4=B1=E8=B4=A5=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=88=90lifecycle.db=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2pkgshi?= =?UTF-8?q?p=20issue=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageship/packageship/application/apps/lifecycle/view.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packageship/packageship/application/apps/lifecycle/view.py b/packageship/packageship/application/apps/lifecycle/view.py index 837b5c7f..74f3ccf8 100644 --- a/packageship/packageship/application/apps/lifecycle/view.py +++ b/packageship/packageship/application/apps/lifecycle/view.py @@ -411,9 +411,7 @@ class IssueStatus(Resource): TypeError: Exception of type Error: Abnormal error """ - issue_dict = self._get_issue_status() - return jsonify(ResponseCode.response_json( - ResponseCode.SUCCESS, issue_dict)) + return self._get_issue_status() class IssueCatch(Resource): -- Gitee