@@ -226,13 +260,16 @@ export default class PipelineLog extends React.Component {
- {t('DURATION_VALUE', {
- value: time ? formatUsedTime(time) : '-',
- })}
+
-
+ {this.renderLogButton()}
{this.renderLogContent()}
diff --git a/src/stores/devops/log.js b/src/stores/devops/log.js
index 62fc445111b..e484e3db25b 100644
--- a/src/stores/devops/log.js
+++ b/src/stores/devops/log.js
@@ -29,26 +29,47 @@ export default class PipelineRunStore extends BaseStore {
}
async getStepLog({ devops, cluster, name, branch, runId, nodeId, stepId }) {
+ const params = this.stepLogData.start
+ ? `?start=${this.stepLogData.start}`
+ : ''
+ const headers = branch
+ ? {}
+ : {
+ 'x-file-size-limit': 1024 * 1024 * 5,
+ }
const result = await request.defaults({
url: `${this.getDevopsUrlV2({
cluster,
devops,
})}pipelines/${decodeURIComponent(name)}${
branch ? `/branches/${encodeURIComponent(branch)}` : ''
- }/runs/${runId}/nodes/${nodeId}/steps/${stepId}/log/?start=${this
- .stepLogData.start || 0}`,
+ }/runs/${runId}/nodes/${nodeId}/steps/${stepId}/log/${params}`,
+ options: { headers },
handler: resp => {
if (resp.status === 200) {
return resp.text().then(res => ({ data: res, headers: resp.headers }))
}
},
})
- const prevLog = this.stepLogData.log
+ const prevLog = !this.stepLogData.start ? '' : this.stepLogData.log
this.stepLogData = {
log: prevLog + get(result, 'data', ''),
start: result.headers.get('x-text-size'),
hasMore: Boolean(result.headers.get('x-more-data')),
}
+ if (
+ result.headers.get('X-File-Size-Limit-Out') === 'true' ||
+ this.log?.length > 1024 * 1024 * 5
+ ) {
+ this.stepLogData.hasMore = false
+ this.stepLogData.log += `\n
+*****************************************************************
+* *
+* The log is too large, please download it to view the details. *
+* *
+*****************************************************************
+ `
+ }
}
@action
diff --git a/src/stores/devops/run.js b/src/stores/devops/run.js
index 1b25249a469..a019457aa0f 100644
--- a/src/stores/devops/run.js
+++ b/src/stores/devops/run.js
@@ -81,6 +81,9 @@ export default class PipelineRunStore extends BaseStore {
@observable
logSize = 0
+ @observable
+ overflow = false
+
@observable
hasMore = false
@@ -329,7 +332,7 @@ export default class PipelineRunStore extends BaseStore {
this.runStartDetailLogs = ''
this.hasMore = false
}
- if (this.logSize >= 1024 * 1024 * 20) {
+ if (this.overflow) {
const result = await request.get(
`${this.getRunUrl({
cluster,
@@ -350,6 +353,8 @@ export default class PipelineRunStore extends BaseStore {
${result}`
} else {
+ const start = this.logSize
+ const params = start ? `?start=${start}` : ''
const result = await request.get(
`${this.getRunUrl({
cluster,
@@ -357,33 +362,68 @@ ${result}`
name,
branch,
runId,
- })}log/?start=${this.logSize}`,
+ })}log/${params}`,
{},
{
headers: {
- 'x-file-size-limit': 1024 * 100,
+ // 'x-file-size-limit': 1024 * 1024 * 10,
'x-with-headers': true,
},
}
)
- this.logSize += Number(result.headers.get('X-File-Size'))
- this.hasMore = result.headers.get('X-File-Size-Limit-Out') !== 'true'
+ const size = result.headers.get('x-text-size')
+ if (size) {
+ this.logSize = Number(size)
+ this.hasMore = Boolean(result.headers.get('x-more-data'))
+ } else {
+ this.logSize += Number(result.headers.get('x-text-size'))
+ this.hasMore = Boolean(result.headers.get('x-more-data'))
+ }
+ this.overflow =
+ Boolean(result.headers.get('X-File-Size-Limit-Out')) ||
+ this.logSize >= 1024 * 1024 * 10
+
result.text().then(text => {
- this.runStartDetailLogs += this.removeSameWords(
- this.runStartDetailLogs,
- text
- )
+ if (start === 0) {
+ this.runStartDetailLogs = text
+ return
+ }
+ // console.log(this.runStartDetailLogs.slice(-100).split('\n'))
+ const arr = this.runStartDetailLogs.slice(-100).split('\n')
+ if (arr.length >= 2) {
+ arr.pop()
+ if (arr.length && arr.pop().startsWith('Finished:')) {
+ //
+ } else {
+ this.runStartDetailLogs += text
+ }
+ } else {
+ this.runStartDetailLogs += text
+ }
})
}
}
-
- removeSameWords = (str1, str2) => {
- const end = str1.slice(-100)
- const index = str2.indexOf(end)
- if (index === -1) {
- return str2
- }
- return str2.slice(index + end.length)
+ // removeSameWords = (str1, str2) => {
+ // const end = str1.slice(-100)
+ // const index = str2.indexOf(end)
+ // if (index === -1) {
+ // return str2
+ // }
+ // return str2.slice(index + end.length)
+ // }
+
+ handleJumpFullLogs({ devops, name, branch, cluster }) {
+ name = decodeURIComponent(name)
+ const url = getClusterUrl(
+ `${window.location.protocol}//${window.location.host}/${this.getRunUrl({
+ cluster,
+ devops,
+ name,
+ branch,
+ runId: this.runDetail.id,
+ })}log/?start=0`
+ )
+ window.open(url)
}
async handleDownloadLogs({ devops, name, branch, cluster }) {
@@ -470,4 +510,4 @@ ${result}`
}
)
}
-}
+}
\ No newline at end of file