-
{{ metadata ? $t('logs') : log_path }}
+ {{ $t('logs') }}
{{ $t('logs_share_with_yunopaste') }}
@@ -76,11 +77,10 @@ export default {
return {
// Log data
description: '',
- log_path: '',
+ info: {},
logs: '',
- metadata: {},
// Logs line display
- numberOfLines: 50,
+ numberOfLines: 25,
moreLogsAvailable: false
}
},
@@ -94,6 +94,7 @@ export default {
const queryString = objectToParams({
path: this.name,
filter_irrelevant: '',
+ with_suboperations: '',
number: this.numberOfLines
})
@@ -105,18 +106,24 @@ export default {
this.moreLogsAvailable = false
}
this.description = log.description
- this.log_path = log.log_path
- this.metadata = log.metadata
const levels = ['ERROR', 'WARNING', 'SUCCESS', 'INFO']
this.logs = log.logs.map(line => {
for (const level of levels) {
if (line.includes(level + ' -')) {
- return `${line}`
+ return `${line}`
}
}
return line
}).join('\n')
+
+ const { started_at, ended_at, error, success, suboperations } = log.metadata
+ const info = { path: log.log_path, started_at, ended_at }
+ if (!success) info.error = error
+ if (suboperations) info.suboperations = suboperations
+ this.info = info
})
},
diff --git a/app/src/views/tool/ToolLogs.vue b/app/src/views/tool/ToolLogs.vue
index 41c4f042..2a723721 100644
--- a/app/src/views/tool/ToolLogs.vue
+++ b/app/src/views/tool/ToolLogs.vue
@@ -32,6 +32,7 @@
import api from '@/api'
import { distanceToNow, readableDate } from '@/helpers/filters/date'
+
export default {
name: 'ServiceList',
@@ -59,7 +60,6 @@ export default {
methods: {
fetchData () {
- // FIXME only prints operation for now (can't receive 'history', 'app', 'service', etc.)
api.get(`logs?limit=${25}&with_details`).then(({ operation }) => {
operation.forEach((log, index) => {
if (log.success === '?') {
@@ -83,6 +83,3 @@ export default {
}
}
-
-