Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
openEuler-Advisor
提交
e11af4d7
O
openEuler-Advisor
项目概览
openeuler
/
openEuler-Advisor
通知
47
Star
4
Fork
4
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openEuler-Advisor
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
e11af4d7
编写于
8月 31, 2020
作者:
O
openeuler-ci-bot
提交者:
Gitee
8月 31, 2020
浏览文件
操作
浏览文件
下载
差异文件
!102 修改单包查询时,maintaniner和maintainlevel
Merge pull request !102 from jiangpengjuj/master
上级
d472f62d
93a57822
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
5 deletion
+24
-5
packageship/packageship/application/apps/package/function/packages.py
...packageship/application/apps/package/function/packages.py
+21
-0
packageship/packageship/application/apps/package/serialize.py
...ageship/packageship/application/apps/package/serialize.py
+0
-2
packageship/packageship/libs/log/loghelper.py
packageship/packageship/libs/log/loghelper.py
+3
-3
未找到文件。
packageship/packageship/application/apps/package/function/packages.py
浏览文件 @
e11af4d7
...
...
@@ -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
):
"""
...
...
packageship/packageship/application/apps/package/serialize.py
浏览文件 @
e11af4d7
...
...
@@ -286,10 +286,8 @@ class SinglePackInfoSchema(Schema):
'version'
,
'release'
,
'url'
,
'maintainer'
,
'feature'
,
'rpm_license'
,
'maintainlevel'
,
'summary'
,
'description'
)
...
...
packageship/packageship/libs/log/loghelper.py
浏览文件 @
e11af4d7
...
...
@@ -5,7 +5,7 @@ Logging related
import
os
import
pathlib
import
logging
from
logging.handlers
import
RotatingFileHandler
from
concurrent_log_handler
import
Concurrent
RotatingFileHandler
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
=
Concurrent
RotatingFileHandler
(
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
=
Concurrent
RotatingFileHandler
(
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录