Skip to content

Commit c46b9c3

Browse files
committed
fix: Fix the issue of abnormal logs in Cronjob backup directory
1 parent 9822427 commit c46b9c3

File tree

9 files changed

+21
-1
lines changed

9 files changed

+21
-1
lines changed

agent/app/service/cronjob_backup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func (u *CronjobService) handleDatabase(cronjob model.Cronjob, startTime time.Ti
166166
}
167167

168168
func (u *CronjobService) handleDirectory(cronjob model.Cronjob, startTime time.Time, taskItem *task.Task) error {
169-
taskItem.AddSubTaskWithOps(task.GetTaskName(i18n.GetMsgByKey("BackupFileOrDir"), task.TaskBackup, task.TaskScopeCronjob), func(task *task.Task) error {
169+
taskItem.AddSubTaskWithOps(task.GetTaskName(cronjob.SourceDir, task.TaskBackup, task.TaskScopeCronjob), func(task *task.Task) error {
170170
accountMap, err := NewBackupClientMap(strings.Split(cronjob.SourceAccountIDs, ","))
171171
if err != nil {
172172
return err

frontend/src/lang/modules/en.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3355,6 +3355,9 @@ const message = {
33553355
forceDelete: 'Force Delete',
33563356
operateHelper: 'The following nodes will undergo {0} operation, do you want to continue?',
33573357
forceDeleteHelper: 'Force delete will ignore node deletion errors and delete database metadata',
3358+
uninstall: 'Uninstall service',
3359+
uninstallHelper:
3360+
'This will uninstall the child node 1Panel service and delete related data. Choose carefully!',
33583361
baseDir: 'Installation Directory',
33593362
baseDirHelper:
33603363
'When the installation directory is empty, it will be installed in the /opt directory by default',

frontend/src/lang/modules/ja.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3213,6 +3213,9 @@ const message = {
32133213
forceDelete: '強制削除',
32143214
operateHelper: '以下のノードに{0}操作を行います。続行しますか?',
32153215
forceDeleteHelper: '強制削除はノード削除エラーを無視し、データベースメタデータを削除します',
3216+
uninstall: 'サービスをアンインストール',
3217+
uninstallHelper:
3218+
'子ノードの1Panelサービスをアンインストールし、関連データを削除します。慎重に選択してください!',
32163219
baseDir: 'インストールディレクトリ',
32173220
baseDirHelper: 'インストールディレクトリが空の場合、デフォルトで/optディレクトリにインストールされます',
32183221
nodePort: 'ノードポート',

frontend/src/lang/modules/ko.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3157,6 +3157,8 @@ const message = {
31573157
forceDelete: '강제 삭제',
31583158
operateHelper: '다음 노드에 대해 {0} 작업을 수행합니다. 계속하시겠습니까?',
31593159
forceDeleteHelper: '강제 삭제는 노드 삭제 오류를 무시하고 데이터베이스 메타데이터를 삭제합니다',
3160+
uninstall: '서비스 제거',
3161+
uninstallHelper: '자식 노드의 1Panel 서비스를 제거하고 관련 데이터를 삭제합니다. 신중하게 선택하세요!',
31603162
baseDir: '설치 디렉토리',
31613163
baseDirHelper: '설치 디렉토리가 비어 있으면 기본적으로 /opt 디렉토리에 설치됩니다',
31623164
nodePort: '노드 포트',

frontend/src/lang/modules/ms.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3284,6 +3284,9 @@ const message = {
32843284
operateHelper: 'Operasi {0} akan dilakukan pada nod berikut, adakah anda ingin meneruskan?',
32853285
forceDeleteHelper:
32863286
'Hapus secara paksa akan mengabaikan ralat penghapusan nod dan menghapus metadata pangkalan data',
3287+
uninstall: 'Nyahpasang perkhidmatan',
3288+
uninstallHelper:
3289+
'Akan nyahpasang perkhidmatan 1Panel nod anak dan padam data berkaitan. Pilih dengan berhati-hati!',
32873290
baseDir: 'Direktori Pemasangan',
32883291
baseDirHelper: 'Apabila direktori pemasangan kosong, secara lalai akan dipasang di direktori /opt',
32893292
nodePort: 'Port Nod',

frontend/src/lang/modules/pt-br.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3290,6 +3290,9 @@ const message = {
32903290
operateHelper: 'A operação {0} será realizada nos seguintes nós, deseja continuar?',
32913291
forceDeleteHelper:
32923292
'Excluir forçadamente ignorará erros de exclusão do nó e removerá os metadados do banco de dados',
3293+
uninstall: 'Desinstalar serviço',
3294+
uninstallHelper:
3295+
'Isso desinstalará o serviço 1Panel do nó filho e excluirá os dados relacionados. Escolha com cuidado!',
32933296
baseDir: 'Diretório de Instalação',
32943297
baseDirHelper: 'Quando o diretório de instalação está vazio, será instalado por padrão no diretório /opt',
32953298
nodePort: 'Porta do Nó',

frontend/src/lang/modules/ru.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3277,6 +3277,8 @@ const message = {
32773277
operateHelper: 'Будет выполнена операция {0} для следующих узлов, вы хотите продолжить?',
32783278
forceDeleteHelper:
32793279
'Принудительное удаление проигнорирует ошибки удаления узла и удалит метаданные базы данных',
3280+
uninstall: 'Удалить службу',
3281+
uninstallHelper: 'Будет удалена служба 1Panel дочернего узла и связанные данные. Выбирайте осторожно!',
32803282
baseDir: 'Каталог установки',
32813283
baseDirHelper: 'Если каталог установки пуст, по умолчанию он будет установлен в каталоге /opt',
32823284
nodePort: 'Порт узла',

frontend/src/lang/modules/zh-Hant.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3110,6 +3110,8 @@ const message = {
31103110
forceDelete: '強制刪除',
31113111
operateHelper: '將對以下節點執行 {0} 操作,是否繼續?',
31123112
forceDeleteHelper: '強制刪除將忽略節點刪除錯誤並刪除資料庫元資料',
3113+
uninstall: '卸載服務',
3114+
uninstallHelper: '將卸載子節點 1Panel 服務,刪除相關數據,請謹慎選擇!',
31133115
baseDir: '安裝目錄',
31143116
baseDirHelper: '安裝目錄為空時,預設安裝於 /opt 目錄下',
31153117
nodePort: '節點端口',

frontend/src/lang/modules/zh.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3091,6 +3091,8 @@ const message = {
30913091
fixAPI: '排查节点日志,检查防火墙端口是否正常放行',
30923092
forceDelete: '强制删除',
30933093
operateHelper: '将对以下节点进行 {0} 操作,是否继续?',
3094+
uninstall: '卸载服务',
3095+
uninstallHelper: '将卸载子节点 1Panel 服务,删除相关数据,谨慎选择!',
30943096
forceDeleteHelper: '强制删除将会忽略节点删除错误,删除数据库元数据',
30953097
baseDir: '安装目录',
30963098
baseDirHelper: '安装目录为空时,默认安装在 /opt 目录下',

0 commit comments

Comments
 (0)