diff --git a/packageship/packageship/application/__init__.py b/packageship/packageship/application/__init__.py index 810d6ce59ab6936a9c982d1fb8e8a3dcdfe778f4..0ca16e9d7e436693beb4fb48eed60e7289a7ce5c 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/application/apps/lifecycle/view.py b/packageship/packageship/application/apps/lifecycle/view.py index efce4bb4216ab1175af99eca635f89cc6f3ff02c..74f3ccf8e6436ecb15d7185e2fe1c0c10552e36f 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): """ @@ -409,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): diff --git a/packageship/packageship/application/initsystem/data_import.py b/packageship/packageship/application/initsystem/data_import.py index 1fda79f08fe0b0ba0395e2ceb93861de0c24e897..8ea467f569ee946b411ceeb02bcb82f92dbb65f0 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 diff --git a/packageship/packageship/libs/log/loghelper.py b/packageship/packageship/libs/log/loghelper.py index fc53bb214b27863e8d015d29957b957cb33aa697..624227c6a3d6d552b0f116aef81f2727f1fbd9fd 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():