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] try to make websockets relative

Browse source
This commit is contained in:
Laurent Peuch 2018-08-27 01:09:25 +02:00
parent 67c837c496
commit f7ea9da20c
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
run.py
View file

@ -389,13 +389,13 @@ async def job(request, job_id):
if job.count == 0:
raise NotFound()
return {"job": job[0], 'relative_path_to_root': '../../'}
return {"job": job[0], 'relative_path_to_root': '../../', 'path': request.path}
@app.route('/')
@jinja.template('index.html')
async def index(request):
return {'relative_path_to_root': ''}
return {'relative_path_to_root': '', 'path': request.path}
def main(path_to_analyseCI, ssl=False, keyfile_path="/etc/yunohost/certs/ci-apps.yunohost.org/key.pem", certfile_path="/etc/yunohost/certs/ci-apps.yunohost.org/crt.pem"):

4
static/js/app.js
View file

@ -6,6 +6,10 @@ function websocketPrefix() {
}
}
function websocketRelativePath(path) {
return window.location.pathname.substring(0, window.location.pathname.length - path.length)
}
/* ansi_up.js
* author : Dru Nelson
* license : MIT

2
templates/index.html
View file

@ -45,7 +45,7 @@
}
})
ws = new WebSocket(websocketPrefix() + '://' + document.domain + ':' + location.port + '/index-ws');
ws = new WebSocket(websocketPrefix() + '://' + document.domain + ':' + location.port + websocketRelativePath('<{ path }>') + '/index-ws');
ws.onmessage = function (event) {
var message = JSON.parse(event.data);

2
templates/job.html
View file

@ -50,7 +50,7 @@
}
})
ws = new WebSocket(websocketPrefix() + '://' + document.domain + ':' + location.port + '/job-<{ job.id }>-ws');
ws = new WebSocket(websocketPrefix() + '://' + document.domain + ':' + location.port + websocketRelativePath('<{ path }>') + '/job-<{ job.id }>-ws');
ws.onmessage = function (event) {
var message = JSON.parse(event.data);