From 144769d86e3508a937037dc9b21f72bb97b89d4e Mon Sep 17 00:00:00 2001 From: marvzhang Date: Sun, 7 Jun 2020 21:29:28 +0800 Subject: [PATCH] set default log expire time to 1 day --- backend/services/task.go | 4 ++-- frontend/src/store/modules/user.js | 3 +++ frontend/src/views/setting/Setting.vue | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/services/task.go b/backend/services/task.go index e004e8ac..50c58f92 100644 --- a/backend/services/task.go +++ b/backend/services/task.go @@ -213,8 +213,8 @@ func SetLogConfig(wg *sync.WaitGroup, cmd *exec.Cmd, t model.Task, u model.User) // expire duration (in seconds) expireDuration := u.Setting.LogExpireDuration if expireDuration == 0 { - // by default not expire - expireDuration = constants.Infinite + // by default 1 day + expireDuration = 3600 * 24 } // read stdout diff --git a/frontend/src/store/modules/user.js b/frontend/src/store/modules/user.js index e30ef860..185ccde4 100644 --- a/frontend/src/store/modules/user.js +++ b/frontend/src/store/modules/user.js @@ -91,6 +91,9 @@ const user = { if (!response.data.data.setting.max_error_log) { response.data.data.setting.max_error_log = 1000 } + if (!response.data.data.setting.log_expire_duration) { + response.data.data.setting.log_expire_duration = 3600 * 24 + } commit('SET_USER_INFO', response.data.data) window.localStorage.setItem('user_info', JSON.stringify(response.data.data)) }) diff --git a/frontend/src/views/setting/Setting.vue b/frontend/src/views/setting/Setting.vue index ae33be9b..07d88601 100644 --- a/frontend/src/views/setting/Setting.vue +++ b/frontend/src/views/setting/Setting.vue @@ -146,7 +146,7 @@ v-model="userInfo.setting.log_expire_duration" clearable > - +