feat: fix agent logger display
This commit is contained in:
+11
-1
@@ -68,6 +68,14 @@ func (t *AgentTask) GetTimeout() int {
|
||||
return t.Timeout
|
||||
}
|
||||
|
||||
func (t *AgentTask) GetWorkDir() string {
|
||||
return t.WorkDir
|
||||
}
|
||||
|
||||
func (t *AgentTask) GetEnvs() string {
|
||||
return t.Envs
|
||||
}
|
||||
|
||||
func (t *AgentTask) GetSchedule() string {
|
||||
if t.Schedule != "" {
|
||||
return t.Schedule
|
||||
@@ -628,7 +636,9 @@ func (a *Agent) updateTasks(tasks []AgentTask) {
|
||||
// 2. 添加或更新任务
|
||||
for id, task := range newTasks {
|
||||
oldTask, exists := a.tasks[id]
|
||||
if !exists || oldTask.Schedule != task.Schedule || oldTask.Command != task.Command || oldTask.Enabled != task.Enabled {
|
||||
if !exists || oldTask.Schedule != task.Schedule || oldTask.Command != task.Command ||
|
||||
oldTask.Enabled != task.Enabled || oldTask.Timeout != task.Timeout ||
|
||||
oldTask.WorkDir != task.WorkDir || oldTask.Envs != task.Envs {
|
||||
if task.Enabled {
|
||||
err := a.cronManager.AddTask(task)
|
||||
if err != nil {
|
||||
|
||||
+5
-2
@@ -12,6 +12,7 @@ import (
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
internalLogger "github.com/engigu/baihu-panel/internal/logger"
|
||||
"github.com/engigu/baihu-panel/internal/utils"
|
||||
)
|
||||
|
||||
@@ -155,6 +156,7 @@ func cmdStart() {
|
||||
defer unlock()
|
||||
|
||||
initLogger(logFile, true)
|
||||
internalLogger.SetOutput(loggerInstance)
|
||||
|
||||
config := &Config{Interval: 30}
|
||||
if err := loadConfigFile(configFile, config); err != nil {
|
||||
@@ -220,8 +222,9 @@ func cmdRun() {
|
||||
}
|
||||
defer unlock()
|
||||
|
||||
// 重启模式下只输出到文件(因为是从 daemon 进程 exec 过来的)
|
||||
initLogger(logFile, isRestart)
|
||||
// 前台模式始终输出到终端+文件
|
||||
initLogger(logFile, false)
|
||||
internalLogger.SetOutput(loggerInstance)
|
||||
|
||||
config := &Config{Interval: 30}
|
||||
if err := loadConfigFile(configFile, config); err != nil {
|
||||
|
||||
Reference in New Issue
Block a user