From cddfa05e5c640abb784ba095ea1b52f951eccf59 Mon Sep 17 00:00:00 2001 From: jiangpengju Date: Sat, 29 Aug 2020 16:54:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E5=8C=85?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=EF=BC=8Cmaintainer=E5=92=8Cmaintain?= =?UTF-8?q?level?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/package/function/packages.py | 21 +++++++++++++++++++ .../application/apps/package/serialize.py | 2 -- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/packageship/packageship/application/apps/package/function/packages.py b/packageship/packageship/application/apps/package/function/packages.py index ba1a7468..d26964b2 100644 --- a/packageship/packageship/application/apps/package/function/packages.py +++ b/packageship/packageship/application/apps/package/function/packages.py @@ -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): + """ + + Args: + srcname: + pack_info_dict: + Returns: + + """ + 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): """ diff --git a/packageship/packageship/application/apps/package/serialize.py b/packageship/packageship/application/apps/package/serialize.py index 3aa63b21..c6993c40 100644 --- a/packageship/packageship/application/apps/package/serialize.py +++ b/packageship/packageship/application/apps/package/serialize.py @@ -286,10 +286,8 @@ class SinglePackInfoSchema(Schema): 'version', 'release', 'url', - 'maintainer', 'feature', 'rpm_license', - 'maintainlevel', 'summary', 'description') -- Gitee From d147d7a4d48ea682b6ff91ab3158c795b1ec6b1b Mon Sep 17 00:00:00 2001 From: jiangpengju Date: Sat, 29 Aug 2020 16:56:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E5=8C=85?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=EF=BC=8Cmaintainer=E5=92=8Cmaintain?= =?UTF-8?q?level?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/apps/package/function/packages.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packageship/packageship/application/apps/package/function/packages.py b/packageship/packageship/application/apps/package/function/packages.py index d26964b2..94f7df1d 100644 --- a/packageship/packageship/application/apps/package/function/packages.py +++ b/packageship/packageship/application/apps/package/function/packages.py @@ -182,11 +182,11 @@ def sing_pack(srcname, tablename): def parsing_maintainner(srcname,pack_info_dict): """ - + Single package query maintainer and maintainlevel Args: - srcname: + srcname: Source package name pack_info_dict: - Returns: + Returns: Dictionary of package information """ with DBHelper(db_name="lifecycle") as database_name: -- Gitee From 93a578221041814517655aa47d67a68ea86aff6e Mon Sep 17 00:00:00 2001 From: jiangpengju Date: Mon, 31 Aug 2020 17:10:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=B0=86RotatingF?= =?UTF-8?q?ileHandler=20=E4=BF=AE=E6=94=B9=E4=B8=BAConcurrentRotatingFileH?= =?UTF-8?q?andler=EF=BC=8CConcurrentRotatingFileHandler=E9=80=82=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E5=A4=9A=E8=BF=9B=E7=A8=8B=E5=A4=9A=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageship/packageship/libs/log/loghelper.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packageship/packageship/libs/log/loghelper.py b/packageship/packageship/libs/log/loghelper.py index 3b121223..fc53bb21 100644 --- a/packageship/packageship/libs/log/loghelper.py +++ b/packageship/packageship/libs/log/loghelper.py @@ -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): -- Gitee