github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

fix issue

pull/410/head
vapao 2021-08-27 14:37:22 +08:00
parent 4e45fe9136
commit c21c5db83d
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spug_api/apps/deploy/utils.py
View File

@ -67,6 +67,7 @@ def _ext1_deploy(req, helper, env):
version=req.version, version=req.version,
spug_version=req.spug_version, spug_version=req.spug_version,
extra=req.extra, extra=req.extra,
remarks='SPUG AUTO MAKE',
created_by_id=req.created_by_id created_by_id=req.created_by_id
) )
build_repository(rep, helper) build_repository(rep, helper)

19
spug_api/apps/repository/views.py
View File

@ -104,19 +104,24 @@ def get_detail(request, r_id):
if not repository: if not repository:
return json_response(error='未找到指定构建记录') return json_response(error='未找到指定构建记录')
rds, counter = get_redis_connection(), 0 rds, counter = get_redis_connection(), 0
key = f'{settings.BUILD_KEY}:{repository.spug_version}' if repository.remarks == 'SPUG AUTO MAKE':
req = repository.deployrequest_set.last()
key = f'{settings.REQUEST_KEY}:{req.id}'
else:
key = f'{settings.BUILD_KEY}:{repository.spug_version}'
data = rds.lrange(key, counter, counter + 9) data = rds.lrange(key, counter, counter + 9)
response = AttrDict(data='', step=0, s_status='process', status=repository.status) response = AttrDict(data='', step=0, s_status='process', status=repository.status)
while data: while data:
for item in data: for item in data:
counter += 1 counter += 1
item = json.loads(item.decode()) item = json.loads(item.decode())
if 'data' in item: if item['key'] == 'local':
response.data += item['data'] if 'data' in item:
if 'step' in item: response.data += item['data']
response.step = item['step'] if 'step' in item:
if 'status' in item: response.step = item['step']
response.status = item['status'] if 'status' in item:
response.status = item['status']
data = rds.lrange(key, counter, counter + 9) data = rds.lrange(key, counter, counter + 9)
response.index = counter response.index = counter
if repository.status in ('0', '1'): if repository.status in ('0', '1'):