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 91e7aa6c2683f871a24cc2a4bf1e9315369dae81..a5525b432bf53b09924f5e382d20834f23639f26 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,10 +411,8 @@ 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/libs/log/loghelper.py b/packageship/packageship/libs/log/loghelper.py index 3b121223c9d01e877f44a9d3e12d16bc22033532..ee557d7e52c8103260e163035b5ef6f021e6309e 100644 --- a/packageship/packageship/libs/log/loghelper.py +++ b/packageship/packageship/libs/log/loghelper.py @@ -52,8 +52,8 @@ def setup_log(config=None): file_log_handler.setFormatter(formatter) - logging.getLogger().addHandler(file_log_handler) - + return file_log_handler + class Log(): """