diff --git a/agent/app/dto/request/host_tool.go b/agent/app/dto/request/host_tool.go index bbd9ee691..cde9a351b 100644 --- a/agent/app/dto/request/host_tool.go +++ b/agent/app/dto/request/host_tool.go @@ -33,6 +33,7 @@ type SupervisorProcessConfig struct { Dir string `json:"dir"` Numprocs string `json:"numprocs"` AutoRestart string `json:"autoRestart"` + AutoStart string `json:"autoStart"` } type SupervisorProcessFileReq struct { diff --git a/agent/app/dto/response/host_tool.go b/agent/app/dto/response/host_tool.go index 0c7783736..94dbd03c1 100644 --- a/agent/app/dto/response/host_tool.go +++ b/agent/app/dto/response/host_tool.go @@ -31,6 +31,7 @@ type SupervisorProcessConfig struct { Msg string `json:"msg"` Status []ProcessStatus `json:"status"` AutoRestart string `json:"autoRestart"` + AutoStart string `json:"autoStart"` } type ProcessStatus struct { diff --git a/agent/app/service/host_tool.go b/agent/app/service/host_tool.go index 73be249d2..b60fb61e1 100644 --- a/agent/app/service/host_tool.go +++ b/agent/app/service/host_tool.go @@ -323,6 +323,7 @@ func handleProcess(supervisordDir string, req request.SupervisorProcessConfig, c _, _ = section.NewKey("command", strings.TrimSpace(req.Command)) _, _ = section.NewKey("directory", req.Dir) _, _ = section.NewKey("autorestart", req.AutoRestart) + _, _ = section.NewKey("autostart", req.AutoStart) _, _ = section.NewKey("startsecs", "3") _, _ = section.NewKey("stdout_logfile", outLog) _, _ = section.NewKey("stderr_logfile", errLog) @@ -360,6 +361,8 @@ func handleProcess(supervisordDir string, req request.SupervisorProcessConfig, c numprocsKey.SetValue(req.Numprocs) autoRestart := section.Key("autorestart") autoRestart.SetValue(req.AutoRestart) + autoStart := section.Key("autostart") + autoStart.SetValue(req.AutoStart) if err = configFile.SaveTo(iniPath); err != nil { return err @@ -429,6 +432,9 @@ func handleProcessConfig(configDir, containerName string) ([]response.Supervisor if autoRestart, _ := section.GetKey("autorestart"); autoRestart != nil { config.AutoRestart = autoRestart.Value() } + if autoStart, _ := section.GetKey("autostart"); autoStart != nil { + config.AutoStart = autoStart.Value() + } _ = getProcessStatus(&config, containerName) result = append(result, config) } diff --git a/frontend/src/api/interface/host-tool.ts b/frontend/src/api/interface/host-tool.ts index ef3639a00..0f0c2afdf 100644 --- a/frontend/src/api/interface/host-tool.ts +++ b/frontend/src/api/interface/host-tool.ts @@ -43,6 +43,7 @@ export namespace HostTool { numprocs: string; status?: ProcessStatus[]; autoRestart: string; + autoStart: string; } export interface ProcessStatus { diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 89130c1e1..a82fb55c4 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -2864,6 +2864,9 @@ const message = { manage: 'Management', autoRestart: 'Auto Restart', EXITED: 'Exited', + autoRestartHelper: 'Whether to automatically restart the program after it crashes', + autoStart: 'Auto Start', + autoStartHelper: 'Whether to automatically start the service after Supervisor starts', }, }, xpack: { diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index b1996cae3..dc5501638 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -2758,6 +2758,9 @@ const message = { manage: '管理', autoRestart: '自動再起動', EXITED: '終了しました', + autoRestartHelper: 'プログラムが異常終了した後に自動的に再起動するかどうか', + autoStart: '自動起動', + autoStartHelper: 'Supervisor 起動後にサービスを自動的に起動するかどうか', }, }, xpack: { diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index 4627e8c64..136c0a4d6 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -2709,6 +2709,9 @@ const message = { manage: '관리', autoRestart: '자동 재시작', EXITED: '종료됨', + autoRestartHelper: '프로그램이 비정상적으로 종료된 후 자동으로 재시작할지 여부', + autoStart: '자동 시작', + autoStartHelper: 'Supervisor 시작 후 서비스를 자동으로 시작할지 여부', }, }, xpack: { diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index b46fa7600..be9b21d07 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -2820,6 +2820,10 @@ const message = { manage: 'Pengurusan', autoRestart: 'Auto Restart', EXITED: 'Telah keluar', + autoRestartHelper: + 'Sama ada untuk memulakan semula program secara automatik selepas ia tamat secara luar jangka', + autoStart: 'Mula Automatik', + autoStartHelper: 'Sama ada untuk memulakan perkhidmatan secara automatik selepas Supervisor mula', }, }, xpack: { diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index a15c43547..083bb77f5 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -2824,6 +2824,9 @@ const message = { manage: 'Gerenciamento', autoRestart: 'Reinicialização Automática', EXITED: 'Saiu', + autoRestartHelper: 'Se o programa falhar, reiniciar automaticamente', + autoStart: 'Início Automático', + autoStartHelper: 'Se o serviço deve ser iniciado automaticamente após o Supervisor iniciar', }, }, xpack: { diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index 3e285bbc6..b73bbc501 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -2816,6 +2816,9 @@ const message = { manage: 'Управление', autoRestart: 'Автоматический перезапуск', EXITED: 'Вышел', + autoRestartHelper: 'Автоматически перезапускать программу после её аварийного завершения', + autoStart: 'Автозапуск', + autoStartHelper: 'Автоматически запускать сервис после запуска Supervisor', }, }, xpack: { diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts index 7759820c8..1a7747a78 100644 --- a/frontend/src/lang/modules/tr.ts +++ b/frontend/src/lang/modules/tr.ts @@ -2902,6 +2902,9 @@ const message = { manage: 'Yönetim', autoRestart: 'Otomatik Yeniden Başlatma', EXITED: 'Çıkıldı', + autoRestartHelper: 'Program çöktükten sonra otomatik olarak yeniden başlatılsın mı?', + autoStart: 'Otomatik Başlat', + autoStartHelper: 'Supervisor başlatıldıktan sonra servis otomatik olarak başlatılsın mı?', }, }, xpack: { diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index 107302d05..b2b5cabd9 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -2672,6 +2672,9 @@ const message = { manage: '管理', autoRestart: '自動重啟', EXITED: '已退出', + autoRestartHelper: '程式異常退出後是否自動重啟', + autoStart: '自動啟動', + autoStartHelper: 'Supervisor 啟動後是否自動啟動服務', }, }, xpack: { diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 6d481af68..354c43f4d 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -2662,6 +2662,9 @@ const message = { manage: '管理', autoRestart: '自动重启', EXITED: '已退出', + autoRestartHelper: '程序异常退出后是否自动重启', + autoStart: '自动启动', + autoStartHelper: 'Supervisor 启动后是否自动启动服务', }, }, xpack: { diff --git a/frontend/src/views/toolbox/supervisor/create/index.vue b/frontend/src/views/toolbox/supervisor/create/index.vue index a4e080976..e429d19f8 100644 --- a/frontend/src/views/toolbox/supervisor/create/index.vue +++ b/frontend/src/views/toolbox/supervisor/create/index.vue @@ -32,6 +32,11 @@ + {{ $t('tool.supervisor.autoRestartHelper') }} + + + + {{ $t('tool.supervisor.autoStartHelper') }}