YunoHost/yunorunner
1
0
Fork 0
mirror of https://github.com/YunoHost/yunorunner.git synced 2024-09-03 20:05:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

[mod] send jobs list during websocket initialisation

Browse source
This commit is contained in:
Laurent Peuch 2018-07-13 22:10:40 +02:00
parent 4ed5a01e8c
commit 754cbdec87
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
run.py
View file

@ -172,6 +172,11 @@ def subscribe(ws, channel):
async def index_ws(request, websocket): async def index_ws(request, websocket):
subscribe(websocket, "jobs") subscribe(websocket, "jobs")
await websocket.send(ujson.dumps({
"target": "init_jobs",
"data": map(model_to_dict, Job.select()),
}))
while True: while True:
data = await websocket.recv() data = await websocket.recv()
print(f"websocket: {data}") print(f"websocket: {data}")

8
templates/index.html
View file

@ -39,10 +39,6 @@
}, },
}) })
$.getJSON("/api/jobs").done(function(data) {
app.jobs = data;
})
ws = new WebSocket('ws://' + document.domain + ':' + location.port + '/index-ws'); ws = new WebSocket('ws://' + document.domain + ':' + location.port + '/index-ws');
ws.onmessage = function (event) { ws.onmessage = function (event) {
@ -50,7 +46,9 @@
var data = message.data; var data = message.data;
var target = message.target; var target = message.target;
if (target == "update_job") { if (target == "init_jobs") {
app.jobs = data;
} else if (target == "update_job") {
for (var i = 0; i < app.jobs.length; ++i) { for (var i = 0; i < app.jobs.length; ++i) {
if (app.jobs[i].id == data.id) { if (app.jobs[i].id == data.id) {
Vue.set(app.jobs, i, data); Vue.set(app.jobs, i, data);