Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
openEuler-Advisor
提交
f7003f3f
O
openEuler-Advisor
项目概览
openeuler
/
openEuler-Advisor
通知
34
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f7003f3f
编写于
8月 10, 2020
作者:
G
gongzt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Call remote api service from command line
上级
40c558e3
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
8 addition
and
48 deletion
+8
-48
packageship/packageship/application/__init__.py
packageship/packageship/application/__init__.py
+0
-6
packageship/packageship/application/settings.py
packageship/packageship/application/settings.py
+0
-2
packageship/packageship/pkgship.py
packageship/packageship/pkgship.py
+7
-39
packageship/packageship/system_config.py
packageship/packageship/system_config.py
+1
-1
未找到文件。
packageship/packageship/application/__init__.py
浏览文件 @
f7003f3f
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
"""
"""
from
flask
import
Flask
from
flask
import
Flask
from
flask_session
import
Session
from
flask_session
import
Session
from
flask_apscheduler
import
APScheduler
from
packageship.application.settings
import
Config
from
packageship.application.settings
import
Config
from
packageship.libs.log
import
setup_log
from
packageship.libs.log
import
setup_log
...
@@ -24,11 +23,6 @@ def init_app(operation):
...
@@ -24,11 +23,6 @@ def init_app(operation):
app
.
config
.
from_object
(
Config
)
app
.
config
.
from_object
(
Config
)
# Register a scheduled task
scheduler
=
APScheduler
()
scheduler
.
init_app
(
app
)
scheduler
.
start
()
# Open session function
# Open session function
Session
(
app
)
Session
(
app
)
...
...
packageship/packageship/application/settings.py
浏览文件 @
f7003f3f
...
@@ -19,8 +19,6 @@ class Config():
...
@@ -19,8 +19,6 @@ class Config():
LOG_LEVEL
=
'INFO'
LOG_LEVEL
=
'INFO'
SCHEDULER_API_ENABLED
=
True
def
__init__
(
self
):
def
__init__
(
self
):
self
.
_read_config
=
ReadConfig
()
self
.
_read_config
=
ReadConfig
()
...
...
packageship/packageship/pkgship.py
浏览文件 @
f7003f3f
...
@@ -550,11 +550,6 @@ class AllPackageCommand(PkgshipCommand):
...
@@ -550,11 +550,6 @@ class AllPackageCommand(PkgshipCommand):
self
.
params
=
[(
'-db'
,
'str'
,
'name of the database operated'
,
''
,
'store'
),
self
.
params
=
[(
'-db'
,
'str'
,
'name of the database operated'
,
''
,
'store'
),
(
'-remote'
,
'str'
,
'The address of the remote service'
,
(
'-remote'
,
'str'
,
'The address of the remote service'
,
False
,
'store_true'
),
False
,
'store_true'
),
(
'-pkgname'
,
'str'
,
'Package name that needs fuzzy matching'
,
''
,
'store'
),
(
'-maintainner'
,
'str'
,
'Maintainer
\'
s name'
,
''
,
'store'
),
(
'-maintainlevel'
,
'str'
,
'Maintain the level of data'
,
''
,
'store'
),
]
]
def
register
(
self
):
def
register
(
self
):
...
@@ -570,26 +565,6 @@ class AllPackageCommand(PkgshipCommand):
...
@@ -570,26 +565,6 @@ class AllPackageCommand(PkgshipCommand):
super
(
AllPackageCommand
,
self
).
register
()
super
(
AllPackageCommand
,
self
).
register
()
self
.
parse
.
set_defaults
(
func
=
self
.
do_command
)
self
.
parse
.
set_defaults
(
func
=
self
.
do_command
)
def
__parse_package
(
self
,
response_data
,
table_name
):
"""
Description: Parse the corresponding data of the package
Args:
response_data: http request response content
Returns:
Raises:
"""
if
response_data
.
get
(
'code'
)
==
ResponseCode
.
SUCCESS
:
package_all
=
response_data
.
get
(
'data'
)
if
isinstance
(
package_all
,
list
):
for
package_item
in
package_all
:
row_data
=
[
package_item
.
get
(
'name'
),
table_name
,
package_item
.
get
(
'version'
),
package_item
.
get
(
'license'
)]
self
.
table
.
add_row
(
row_data
)
else
:
print
(
response_data
.
get
(
'msg'
))
def
do_command
(
self
,
params
):
def
do_command
(
self
,
params
):
"""
"""
Description: Action to execute command
Description: Action to execute command
...
@@ -602,12 +577,7 @@ class AllPackageCommand(PkgshipCommand):
...
@@ -602,12 +577,7 @@ class AllPackageCommand(PkgshipCommand):
"""
"""
self
.
_set_read_host
(
params
.
remote
)
self
.
_set_read_host
(
params
.
remote
)
_url
=
self
.
read_host
+
\
_url
=
self
.
read_host
+
\
'/packages?table_name={table_name}&query_pkg_name={pkg_name}&
\
'/packages?dbName={dbName}'
.
format
(
dbName
=
params
.
db
)
maintainner={maintainner}&maintainlevel={maintainlevel}'
.
format
(
table_name
=
params
.
db
,
pkg_name
=
params
.
pkgname
,
maintainner
=
params
.
maintainner
,
maintainlevel
=
params
.
maintainlevel
)
try
:
try
:
response
=
requests
.
get
(
_url
)
response
=
requests
.
get
(
_url
)
except
ConnErr
as
conn_error
:
except
ConnErr
as
conn_error
:
...
@@ -616,7 +586,7 @@ class AllPackageCommand(PkgshipCommand):
...
@@ -616,7 +586,7 @@ class AllPackageCommand(PkgshipCommand):
else
:
else
:
if
response
.
status_code
==
200
:
if
response
.
status_code
==
200
:
self
.
__parse_package
(
json
.
loads
(
response
.
text
),
params
.
db
)
self
.
parse_package
(
json
.
loads
(
response
.
text
)
)
if
self
.
table
:
if
self
.
table
:
print
(
self
.
table
)
print
(
self
.
table
)
else
:
else
:
...
@@ -642,9 +612,8 @@ class UpdatePackageCommand(PkgshipCommand):
...
@@ -642,9 +612,8 @@ class UpdatePackageCommand(PkgshipCommand):
self
.
params
=
[
self
.
params
=
[
(
'packagename'
,
'str'
,
'Source package name'
,
''
,
'store'
),
(
'packagename'
,
'str'
,
'Source package name'
,
''
,
'store'
),
(
'db'
,
'str'
,
'name of the database operated'
,
''
,
'store'
),
(
'db'
,
'str'
,
'name of the database operated'
,
''
,
'store'
),
(
'-maintainer'
,
'str'
,
'Maintainers name'
,
''
,
'store'
),
(
'-m'
,
'str'
,
'Maintainers name'
,
''
,
'store'
),
(
'-maintainlevel'
,
'int'
,
'database priority'
,
1
,
'store'
),
(
'-l'
,
'int'
,
'database priority'
,
1
,
'store'
),
(
'-endoflife'
,
'str'
,
'package expiry date'
,
''
,
'store'
)
]
]
def
register
(
self
):
def
register
(
self
):
...
@@ -670,14 +639,13 @@ class UpdatePackageCommand(PkgshipCommand):
...
@@ -670,14 +639,13 @@ class UpdatePackageCommand(PkgshipCommand):
Raises:
Raises:
ConnectionError: Request connection error
ConnectionError: Request connection error
"""
"""
_url
=
self
.
write_host
+
'/
lifeCycle/updatePkg
Info'
_url
=
self
.
write_host
+
'/
packages/package
Info'
try
:
try
:
response
=
requests
.
put
(
response
=
requests
.
put
(
_url
,
data
=
json
.
dumps
({
'pkg_name'
:
params
.
packagename
,
_url
,
data
=
json
.
dumps
({
'pkg_name'
:
params
.
packagename
,
'table_name'
:
params
.
db
,
'table_name'
:
params
.
db
,
'maintainer'
:
params
.
maintainer
,
'maintainer'
:
params
.
m
,
'maintainlevel'
:
params
.
maintainlevel
,
'maintainlevel'
:
params
.
l
}),
'end_of_life'
:
params
.
endoflife
}),
headers
=
self
.
headers
)
headers
=
self
.
headers
)
except
ConnErr
as
conn_error
:
except
ConnErr
as
conn_error
:
LOGGER
.
logger
.
error
(
conn_error
)
LOGGER
.
logger
.
error
(
conn_error
)
...
...
packageship/packageship/system_config.py
浏览文件 @
f7003f3f
...
@@ -30,4 +30,4 @@ DATABASE_FOLDER_PATH = os.path.join('/', 'var', 'run', 'pkgship_dbs')
...
@@ -30,4 +30,4 @@ DATABASE_FOLDER_PATH = os.path.join('/', 'var', 'run', 'pkgship_dbs')
# If the directory of log storage is not configured,
# If the directory of log storage is not configured,
# it will be stored in the following directory specified by the system by default
# it will be stored in the following directory specified by the system by default
LOG_FOLDER_PATH
=
os
.
path
.
join
(
'/'
,
'var'
,
'log'
,
'
logs
'
)
LOG_FOLDER_PATH
=
os
.
path
.
join
(
'/'
,
'var'
,
'log'
,
'
pkgship
'
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录