Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2025-06-13 12:54:29 +00:00
Code Issues Projects Releases Wiki Activity

additional fixes for #79: chunked http log

Browse Source 
fix a missing js function call that broke log output in the
webui, and replace TextDecoderStream with TextDecoder because
the former isn't supported in Firefox
This commit is contained in:
Oliver Giles 2019-02-18 22:06:37 +02:00
parent 807901c719
commit 137f35bdd7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/resources/js/app.js
View File

@ -658,6 +658,7 @@ var Job = function() {
}(); }();
const Run = function() { const Run = function() {
const utf8decoder = new TextDecoder('utf-8');
var state = { var state = {
job: { artifacts: [], upstream: {} }, job: { artifacts: [], upstream: {} },
latestNum: null, latestNum: null,
@ -668,10 +669,13 @@ const Run = function() {
const logFetcher = (vm, name, num) => { const logFetcher = (vm, name, num) => {
const abort = new AbortController(); const abort = new AbortController();
fetch('/log/'+name+'/'+num, {signal:abort.signal}).then(res => { fetch('/log/'+name+'/'+num, {signal:abort.signal}).then(res => {
const reader = res.body.pipeThrough(new TextDecoderStream).getReader(); // ATOW pipeThrough not supported in Firefox
//const reader = res.body.pipeThrough(new TextDecoderStream).getReader();
const reader = res.body.getReader();
let total = 0; let total = 0;
return function pump() { return function pump() {
return reader.read().then(({done, value}) => { return reader.read().then(({done, value}) => {
value = utf8decoder.decode(value);
if (done) if (done)
return; return;
state.log += ansi_up.ansi_to_html(value.replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/\033\[\{([^:]+):(\d+)\033\\/g, (m,$1,$2)=>{return '<a href="/jobs/'+$1+'" onclick="return vroute(this);">'+$1+'</a>:<a href="/jobs/'+$1+'/'+$2+'" onclick="return vroute(this);">#'+$2+'</a>';})); state.log += ansi_up.ansi_to_html(value.replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/\033\[\{([^:]+):(\d+)\033\\/g, (m,$1,$2)=>{return '<a href="/jobs/'+$1+'" onclick="return vroute(this);">'+$1+'</a>:<a href="/jobs/'+$1+'/'+$2+'" onclick="return vroute(this);">#'+$2+'</a>';}));
@ -683,12 +687,11 @@ const Run = function() {
} }
return pump(); return pump();
}); });
} }();
}).catch(e => {}); }).catch(e => {});
return abort; return abort;
} }
return { return {
template: '#run', template: '#run',
mixins: [WebsocketHandler, Utils, ProgressUpdater], mixins: [WebsocketHandler, Utils, ProgressUpdater],
@ -729,7 +732,7 @@ const Run = function() {
next(); next();
}, },
beforeRouteLeave(to, from, next) { beforeRouteLeave(to, from, next) {
this.logstream.close(); this.logstream.abort();
next(); next();
} }
}; };