Commit0083801

committed

Tested correlated job log view. Seems to work but the log chopping is still worse

1 parentb8a6922 commit0083801Copy full SHA for 0083801

File tree

+40

-9

lines changed

+40

-9

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,13 @@ export default {`
`350`	`350`	`},`
`351`	`351`
`352`	`352`	`jobLog () {`
`353`		`-this.$router.push({path:'/pipeline/log', query: { pipelineid:this.pipelineID, runid:this.runID, jobid:this.job.internalID }})`
	`353`	`+var jobid=null`
	`354`	`+if (this.job) {`
	`355`	`+ jobid=this.job.intervalID`
	`356`	`+ }`
	`357`	`+`
	`358`	`+// Route`
	`359`	`+this.$router.push({path:'/pipeline/log', query: { pipelineid:this.pipelineID, runid:this.runID, jobid: jobid }})`
`354`	`360`	`},`
`355`	`361`
`356`	`362`	`startPipeline (pipelineid) {`

Lines changed: 23 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,14 +67,29 @@ export default {`
`67`	`67`	`})`
`68`	`68`	`.then(response=> {`
`69`	`69`	`if (response.data) {`
`70`		`-// We add the received log`
`71`		`-this.logText+=response.data.log`
`72`		`-`
`73`		`-// LF does not work for HTML. Replace with <br />`
`74`		`-this.logText=this.logText.replace(/\n/g,'<br />')`
`75`		`-`
`76`		`-// Set the new start position defined by return value`
`77`		`-this.startPos=response.data.start`
	`70`	`+// Check if we got multiple objects`
	`71`	`+var finished=true`
	`72`	`+for (let i=0, l=response.data.length; i< l; i++) {`
	`73`	`+// We add the received log`
	`74`	`+this.logText+=response.data[i].log`
	`75`	`+`
	`76`	`+// LF does not work for HTML. Replace with <br />`
	`77`	`+this.logText=this.logText.replace(/\n/g,'<br />')`
	`78`	`+`
	`79`	`+// Set the new start position defined by return value`
	`80`	`+this.startPos=response.data[i].start`
	`81`	`+`
	`82`	`+// Job not finished?`
	`83`	`+if (!response.data[i].finished) {`
	`84`	`+ finished=false`
	`85`	`+ }`
	`86`	`+ }`
	`87`	`+`
	`88`	`+// All jobs finished. Stop interval.`
	`89`	`+if (finished) {`
	`90`	`+this.jobRunning=false`
	`91`	`+clearInterval(this.intervalID)`
	`92`	`+ }`
`78`	`93`	`}`
`79`	`94`	`})`
`80`	`95`	`.catch((error)=> {`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,11 @@ func GetJobLogs(c echo.Context) error {`
`126`	`126`	`returnc.String(http.StatusBadRequest,err.Error())`
`127`	`127`	`}`
`128`	`128`
	`129`	`+// Check if job is finished`
	`130`	`+ifjob.Status==gaia.JobSuccess\|\|job.Status==gaia.JobFailed {`
	`131`	`+jL.Finished=true`
	`132`	`+}`
	`133`	`+`
`129`	`134`	`returnc.JSON(http.StatusOK,*jL)`
`130`	`135`	`}`
`131`	`136`	`}`
`@@ -148,6 +153,11 @@ func GetJobLogs(c echo.Context) error {`
`148`	`153`	`returnc.String(http.StatusBadRequest,err.Error())`
`149`	`154`	`}`
`150`	`155`
	`156`	`+// Check if job is finished`
	`157`	`+ifjob.Status==gaia.JobSuccess\|\|job.Status==gaia.JobFailed {`
	`158`	`+jL.Finished=true`
	`159`	`+}`
	`160`	`+`
`151`	`161`	`jobs=append(jobs,*jL)`
`152`	`162`	`}`
`153`	`163`

Comments

(0)