Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
I
install.api
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Script
install.api
Commits
82a0a5c4
Commit
82a0a5c4
authored
Mar 12, 2020
by
金凯强
🎨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试
parent
4d6e0506
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
upgrade_service.py
app/upgrade/upgrade_service.py
+5
-2
db_tools.py
app/utils/db_tools.py
+2
-2
No files found.
app/upgrade/upgrade_service.py
View file @
82a0a5c4
...
...
@@ -78,10 +78,13 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym
if
err
:
logger
.
info
(
f
"有报错信息:{err}"
)
logger
.
info
(
f
'回滚{app_list}成功:{out}'
)
with
db_driver
as
session
:
# 对应的版本信息修改为当前版本
session
.
exec_sql
(
f
'update app_upgrade_log set default_version=1 where id={log_id}'
)
return
{
'err'
:
err
,
"out"
:
out
}
# 注意异常情况下的处理
return
{
'err'
:
err
,
"out"
:
out
}
# 注意异常情况下的处理
def
find_compose_by_upgrade_no
(
self
,
upgrade_no
):
'''
...
...
app/utils/db_tools.py
View file @
82a0a5c4
...
...
@@ -71,7 +71,7 @@ class DBDriver:
return
res
res_dict
=
dict
(
map
(
lambda
x
,
y
:
[
x
,
y
],
fields
,
res
))
#
cur.close()
cur
.
close
()
return
res_dict
def
query_sql
(
self
,
sql
,
*
args
,
**
kwargs
):
...
...
@@ -82,7 +82,7 @@ class DBDriver:
for
r
in
res
:
res_dict
=
OrderedDict
(
map
(
lambda
x
,
y
:
[
x
,
y
],
fields
,
r
))
res_list
.
append
(
res_dict
)
#
cur.close()
cur
.
close
()
return
res_list
def
__enter__
(
self
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment