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-17 11:31:00 +08:00
parent 162680e64b
commit c078f9aa5d
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spug_api/apps/deploy/views.py
View File

@ -135,8 +135,8 @@ class RequestDetailView(View):
rds, key, counter = get_redis_connection(), f'{settings.REQUEST_KEY}:{r_id}', 0 rds, key, counter = get_redis_connection(), f'{settings.REQUEST_KEY}:{r_id}', 0
data = rds.lrange(key, counter, counter + 9) data = rds.lrange(key, counter, counter + 9)
while data: while data:
counter += 10
for item in data: for item in data:
counter += 1
item = json.loads(item.decode()) item = json.loads(item.decode())
if 'data' in item: if 'data' in item:
outputs[item['key']]['data'] += item['data'] outputs[item['key']]['data'] += item['data']
@ -145,6 +145,7 @@ class RequestDetailView(View):
if 'status' in item: if 'status' in item:
outputs[item['key']]['status'] = item['status'] outputs[item['key']]['status'] = item['status']
data = rds.lrange(key, counter, counter + 9) data = rds.lrange(key, counter, counter + 9)
response['index'] = counter
return json_response(response) return json_response(response)
def post(self, request, r_id): def post(self, request, r_id):

1
spug_api/libs/ssh.py
View File

@ -82,7 +82,6 @@ class SSH:
exit_code, line = -1, '' exit_code, line = -1, ''
while True: while True:
line = channel.recv(8196).decode() line = channel.recv(8196).decode()
print(repr(line))
match = self.regex.search(line) match = self.regex.search(line)
if match: if match:
exit_code = int(line.rsplit()[-1]) exit_code = int(line.rsplit()[-1])

5
spug_web/src/pages/deploy/request/Ext1Console.js
View File

@ -26,7 +26,7 @@ function Ext1Console(props) {
Object.assign(outputs, res.outputs) Object.assign(outputs, res.outputs)
setTimeout(() => setFetching(false), 100) setTimeout(() => setFetching(false), 100)
if (res.status === '2') { if (res.status === '2') {
socket = _makeSocket() socket = _makeSocket(res.index)
} }
}) })
return () => socket && socket.close() return () => socket && socket.close()
@ -44,8 +44,7 @@ function Ext1Console(props) {
return () => socket && socket.close() return () => socket && socket.close()
} }
function _makeSocket() { function _makeSocket(index = 0) {
let index = 0;
const token = props.request.id; const token = props.request.id;
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'; const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
const socket = new WebSocket(`${protocol}//${window.location.host}/api/ws/request/${token}/?x-token=${X_TOKEN}`); const socket = new WebSocket(`${protocol}//${window.location.host}/api/ws/request/${token}/?x-token=${X_TOKEN}`);

5
spug_web/src/pages/deploy/request/Ext2Console.js
View File

@ -30,7 +30,7 @@ function Ext2Console(props) {
Object.assign(outputs, res.outputs); Object.assign(outputs, res.outputs);
setTimeout(() => setFetching(false), 100) setTimeout(() => setFetching(false), 100)
if (res.status === '2') { if (res.status === '2') {
socket = _makeSocket() socket = _makeSocket(res.index)
} }
}) })
return () => socket && socket.close() return () => socket && socket.close()
@ -49,8 +49,7 @@ function Ext2Console(props) {
return () => socket && socket.close() return () => socket && socket.close()
} }
function _makeSocket() { function _makeSocket(index = 0) {
let index = 0;
const token = props.request.id; const token = props.request.id;
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'; const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
const socket = new WebSocket(`${protocol}//${window.location.host}/api/ws/request/${token}/?x-token=${X_TOKEN}`); const socket = new WebSocket(`${protocol}//${window.location.host}/api/ws/request/${token}/?x-token=${X_TOKEN}`);