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

!102 修改单包查询时,maintaniner和maintainlevel

Merge pull request !102 from jiangpengjuj/master
......@@ -158,6 +158,7 @@ def sing_pack(srcname, tablename):
ResponseCode.PACK_NAME_NOT_FOUND))
pack_info_dict = SinglePackInfoSchema(
many=False).dump(package_info_obj)
pack_info_dict = parsing_maintainner(srcname, pack_info_dict)
issue_count = database_name.session.query(
PackagesIssue).filter_by(pkg_name=package_info_obj.name).count()
pack_info_dict["issue"] = issue_count
......@@ -179,6 +180,26 @@ def sing_pack(srcname, tablename):
ResponseCode.response_json(
ResponseCode.DIS_CONNECTION_DB))
def parsing_maintainner(srcname,pack_info_dict):
"""
Single package query maintainer and maintainlevel
Args:
srcname: Source package name
pack_info_dict:
Returns: Dictionary of package information
"""
with DBHelper(db_name="lifecycle") as database_name:
maintainer_obj = database_name.session.query(PackagesMaintainer).filter_by(
name=srcname).first()
if maintainer_obj is None:
pack_info_dict["maintainer"] = None
pack_info_dict["maintainlevel"] = None
else:
pack_info_dict["maintainer"] = maintainer_obj.maintainer
pack_info_dict["maintainlevel"] = maintainer_obj.maintainlevel
return pack_info_dict
def buildrequired_search(srcname, tablename):
"""
......
......@@ -286,10 +286,8 @@ class SinglePackInfoSchema(Schema):
'version',
'release',
'url',
'maintainer',
'feature',
'rpm_license',
'maintainlevel',
'summary',
'description')
......
......@@ -5,7 +5,7 @@ Logging related
import os
import pathlib
import logging
from logging.handlers import RotatingFileHandler
from concurrent_log_handler import ConcurrentRotatingFileHandler
from packageship import system_config
from packageship.libs.configutils.readconfig import ReadConfig
......@@ -44,7 +44,7 @@ def setup_log(config=None):
except FileExistsError:
pathlib.Path(path).touch()
file_log_handler = RotatingFileHandler(
file_log_handler = ConcurrentRotatingFileHandler(
path, maxBytes=max_bytes, backupCount=backup_count)
formatter = logging.Formatter(
......@@ -96,7 +96,7 @@ class Log():
self.max_bytes = 314572800
def __init_handler(self):
self.__file_handler = RotatingFileHandler(
self.__file_handler = ConcurrentRotatingFileHandler(
self.__path, maxBytes=self.max_bytes, backupCount=self.backup_count, encoding="utf-8")
def __set_handler(self):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册