提交 94981526 编写于 作者: O openeuler-ci-bot 提交者: Gitee

!124 解决系统配置文件的log_level配置项不工作、在初始化失败没有生成lifecycle.db时,查询pkgship issue报错问题

Merge pull request !124 from 魔箭胖胖/master
......@@ -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()
......
......@@ -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):
"""
......
......@@ -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():
"""
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册