Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions agent/app/service/cronjob.go
Original file line number Diff line number Diff line change
Expand Up @@ -538,11 +538,14 @@ func (u *CronjobService) CleanRecord(req dto.CronjobClean) error {
return err
}
for _, del := range delRecords {
if del.Status == constant.StatusWaiting || del.Status == constant.StatusRunning {
continue
}
if err := cronjobRepo.DeleteRecord(repo.WithByID(del.ID)); err != nil {
return err
}
_ = os.RemoveAll(del.Records)
}
if err := cronjobRepo.DeleteRecord(cronjobRepo.WithByJobID(int(req.CronjobID))); err != nil {
return err
}
return nil
}

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lang/modules/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2254,7 +2254,7 @@ const message = {
hostSystem: 'Host logs',
previousPage: 'Previous page',
nextPage: 'Next page',
filter: 'Filter',
filter: 'Message filter',
service: 'Service',
priority: 'Priority',
priorityEmergency: 'Emergency',
Expand Down Expand Up @@ -3223,7 +3223,7 @@ const message = {
restoreCommunityOfflineHelper:
'Place an official package no older than the current Enterprise version in {path}. Switching is enabled after a usable package is detected.',
restoreCommunityConfirm:
'After switching, you can sign in to Community Edition with the current Enterprise super administrator account. Enterprise-only databases will be deleted during the switch.',
'After switching versions, you can sign in to Community Edition with the current Enterprise super administrator account. Enterprise-only data will be removed during the switch. Proceed with caution.',
restoreCommunityStarting: 'Preparing Community Edition. The panel will restart automatically when ready.',
levelUpPro: 'Upgrade to Commercial Edition',
licenseSync: 'License Sync',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lang/modules/es-es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2289,7 +2289,7 @@ const message = {
hostSystem: 'Logs del host',
previousPage: 'Página anterior',
nextPage: 'Página siguiente',
filter: 'Filtrar',
filter: 'Filtrar mensajes',
service: 'Servicio',
priority: 'Prioridad',
priorityEmergency: 'Emergencia',
Expand Down Expand Up @@ -3284,7 +3284,7 @@ const message = {
restoreCommunityOfflineHelper:
'Coloque en {path} un paquete oficial cuya versión no sea anterior a la versión Enterprise actual. El cambio se habilitará al detectar un paquete utilizable.',
restoreCommunityConfirm:
'Después del cambio, podrá iniciar sesión en Community Edition con la cuenta actual de superadministrador de Enterprise. Las bases de datos exclusivas de Enterprise se eliminarán durante el cambio.',
'Después de cambiar de versión, podrá iniciar sesión en Community Edition con la cuenta actual de superadministrador de Enterprise. Los datos exclusivos de Enterprise se eliminarán durante el cambio. Proceda con precaución.',
restoreCommunityStarting:
'Preparando Community Edition. El panel se reiniciará automáticamente cuando termine.',
levelUpPro: 'Actualizar a la edición comercial',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lang/modules/fa.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2231,7 +2231,7 @@ const message = {
hostSystem: 'لاگ‌های میزبان',
previousPage: 'صفحه قبل',
nextPage: 'صفحه بعد',
filter: 'فیلتر',
filter: 'فیلتر پیام‌ها',
service: 'سرویس',
priority: 'اولویت',
priorityEmergency: 'اضطراری',
Expand Down Expand Up @@ -3192,7 +3192,7 @@ const message = {
restoreCommunityOfflineHelper:
'یک بسته رسمی با نسخه‌ای قدیمی‌تر نبودن از نسخه فعلی Enterprise را در {path} قرار دهید. پس از شناسایی بسته قابل استفاده، تغییر نسخه فعال می‌شود.',
restoreCommunityConfirm:
'پس از تغییر، می‌توانید با حساب ابرمدیر فعلی Enterprise وارد نسخه Community شوید. پایگاه‌های داده ویژه Enterprise در طول تغییر حذف می‌شوند.',
'پس از تغییر نسخه، می‌توانید با حساب ابرمدیر فعلی Enterprise وارد نسخه Community شوید. داده‌های مختص Enterprise در طول تغییر حذف می‌شوند. لطفاً با احتیاط ادامه دهید.',
restoreCommunityStarting:
'نسخه Community در حال آماده‌سازی است. پس از تکمیل، پنل به‌طور خودکار راه‌اندازی مجدد می‌شود.',
levelUpPro: 'ارتقاء به نسخه تجاری',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lang/modules/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2244,7 +2244,7 @@ const message = {
hostSystem: 'ホストログ',
previousPage: '前のページ',
nextPage: '次のページ',
filter: 'フィルター',
filter: 'メッセージフィルター',
service: 'サービス',
priority: '優先度',
priorityEmergency: '緊急',
Expand Down Expand Up @@ -3209,7 +3209,7 @@ const message = {
restoreCommunityOfflineHelper:
'現在の Enterprise バージョン以上の公式パッケージを {path} に配置してください。使用可能なパッケージが検出されると切り替えが有効になります。',
restoreCommunityConfirm:
'切り替え後は、現在の Enterprise スーパー管理者アカウントでコミュニティ版にログインできます。切り替え中に Enterprise 専用データベースが削除されます。',
'バージョン切り替え後は、現在の Enterprise スーパー管理者アカウントでコミュニティ版にログインできます。切り替え中に Enterprise 専用データが消去されるため、慎重に操作してください。',
restoreCommunityStarting: 'コミュニティ版を準備しています。完了後、パネルは自動的に再起動します。',
technicalAdvice: '技術的な相談',
advice: '相談',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lang/modules/ko.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2207,7 +2207,7 @@ const message = {
hostSystem: '호스트 로그',
previousPage: '이전 페이지',
nextPage: '다음 페이지',
filter: '필터',
filter: '메시지 필터',
service: '서비스',
priority: '우선순위',
priorityEmergency: '긴급',
Expand Down Expand Up @@ -3150,7 +3150,7 @@ const message = {
restoreCommunityOfflineHelper:
'현재 Enterprise 버전 이상인 공식 패키지를 {path}에 저장하세요. 사용 가능한 패키지가 감지되면 전환이 활성화됩니다.',
restoreCommunityConfirm:
'전환 후 현재 Enterprise 슈퍼 관리자 계정으로 커뮤니티 버전에 로그인할 수 있습니다. 전환 과정에서 Enterprise 전용 데이터베이스가 삭제됩니다.',
'버전 전환 후 현재 Enterprise 슈퍼 관리자 계정으로 커뮤니티 버전에 로그인할 수 있습니다. 전환 과정에서 Enterprise 전용 데이터가 삭제되므로 신중하게 진행하세요.',
restoreCommunityStarting: '커뮤니티 버전을 준비 중입니다. 완료되면 패널이 자동으로 다시 시작됩니다.',
technicalAdvice: '기술 상담',
advice: '상담',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lang/modules/lo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2188,7 +2188,7 @@ const message = {
hostSystem: 'ລັອກຂອງ Host',
previousPage: 'ໜ້າກ່ອນ',
nextPage: 'ໜ້າຖັດໄປ',
filter: 'ກັ່ນຕອງ',
filter: 'ກັ່ນຕອງຂໍ້ຄວາມ',
service: 'ບໍລິການ',
priority: 'ລະດັບຄວາມສຳຄັນ',
priorityEmergency: 'ສຸກເສີນ',
Expand Down Expand Up @@ -3135,7 +3135,7 @@ const message = {
restoreCommunityOfflineHelper:
'ວາງແພັກເກດທາງການທີ່ມີເວີຊັນບໍ່ຕ່ຳກວ່າ Enterprise ປັດຈຸບັນໄວ້ໃນ {path}. ການສະຫຼັບຈະເປີດໃຊ້ເມື່ອກວດພົບແພັກເກດທີ່ໃຊ້ໄດ້.',
restoreCommunityConfirm:
'ຫຼັງຈາກສະຫຼັບ ສາມາດໃຊ້ບັນຊີຜູ້ດູແລສູງສຸດ Enterprise ປັດຈຸບັນເຂົ້າ Community Edition. ຖານຂໍ້ມູນສະເພາະ Enterprise ຈະຖືກລຶບໃນລະຫວ່າງການສະຫຼັບ.',
'ຫຼັງຈາກສະຫຼັບເວີຊັນ ສາມາດໃຊ້ບັນຊີຜູ້ດູແລສູງສຸດ Enterprise ປັດຈຸບັນເຂົ້າ Community Edition. ຂໍ້ມູນສະເພາະ Enterprise ຈະຖືກລຶບໃນລະຫວ່າງການສະຫຼັບ. ກະລຸນາດຳເນີນການດ້ວຍຄວາມລະມັດລະວັງ.',
restoreCommunityStarting: 'ກຳລັງກະກຽມ Community Edition. ແຜງຄວບຄຸມຈະເລີ່ມໃໝ່ອັດຕະໂນມັດເມື່ອສຳເລັດ.',
levelUpPro: 'ອັບເກຣດເປັນເວີຊັນ Commercial',
licenseSync: 'ຊິງຄ໌ລິຂະສິດ',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lang/modules/ms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2290,7 +2290,7 @@ const message = {
hostSystem: 'Log hos',
previousPage: 'Halaman sebelumnya',
nextPage: 'Halaman seterusnya',
filter: 'Tapis',
filter: 'Tapis mesej',
service: 'Perkhidmatan',
priority: 'Keutamaan',
priorityEmergency: 'Kecemasan',
Expand Down Expand Up @@ -3280,7 +3280,7 @@ const message = {
restoreCommunityOfflineHelper:
'Letakkan pakej rasmi yang tidak lebih lama daripada versi Enterprise semasa dalam {path}. Pertukaran akan didayakan selepas pakej yang boleh digunakan dikesan.',
restoreCommunityConfirm:
'Selepas pertukaran, anda boleh log masuk ke Community Edition menggunakan akaun pentadbir super Enterprise semasa. Pangkalan data khusus Enterprise akan dipadamkan semasa pertukaran.',
'Selepas menukar versi, anda boleh log masuk ke Community Edition menggunakan akaun pentadbir super Enterprise semasa. Data khusus Enterprise akan dipadamkan semasa pertukaran. Sila teruskan dengan berhati-hati.',
restoreCommunityStarting:
'Community Edition sedang disediakan. Panel akan dimulakan semula secara automatik apabila selesai.',
technicalAdvice: 'Konsultasi Teknikal',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lang/modules/pt-br.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2290,7 +2290,7 @@ const message = {
hostSystem: 'Logs do host',
previousPage: 'Página anterior',
nextPage: 'Próxima página',
filter: 'Filtrar',
filter: 'Filtrar mensagens',
service: 'Serviço',
priority: 'Prioridade',
priorityEmergency: 'Emergência',
Expand Down Expand Up @@ -3286,7 +3286,7 @@ const message = {
restoreCommunityOfflineHelper:
'Coloque em {path} um pacote oficial cuja versão não seja anterior à versão Enterprise atual. A troca será habilitada quando um pacote utilizável for detectado.',
restoreCommunityConfirm:
'Após a troca, você poderá entrar na Community Edition com a conta atual de superadministrador da Enterprise. Os bancos de dados exclusivos da Enterprise serão excluídos durante a troca.',
'Após trocar de versão, você poderá entrar na Community Edition com a conta atual de superadministrador da Enterprise. Os dados exclusivos da Enterprise serão removidos durante a troca. Prossiga com cuidado.',
restoreCommunityStarting:
'Preparando a Community Edition. O painel será reiniciado automaticamente quando estiver pronto.',
technicalAdvice: 'Consultoria técnica',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lang/modules/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2272,7 +2272,7 @@ const message = {
hostSystem: 'Журналы хоста',
previousPage: 'Предыдущая страница',
nextPage: 'Следующая страница',
filter: 'Фильтр',
filter: 'Фильтр сообщений',
service: 'Сервис',
priority: 'Приоритет',
priorityEmergency: 'Авария',
Expand Down Expand Up @@ -3257,7 +3257,7 @@ const message = {
restoreCommunityOfflineHelper:
'Поместите официальный пакет версии не ниже текущей Enterprise в {path}. Переключение станет доступно после обнаружения подходящего пакета.',
restoreCommunityConfirm:
'После переключения можно войти в Community Edition с текущей учётной записью суперадминистратора Enterprise. Базы данных Enterprise будут удалены во время переключения.',
'После смены версии можно войти в Community Edition с текущей учётной записью суперадминистратора Enterprise. Во время переключения данные, доступные только в Enterprise, будут удалены. Будьте осторожны.',
restoreCommunityStarting:
'Подготавливается Community Edition. После завершения панель автоматически перезапустится.',
technicalAdvice: 'Техническая консультация',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lang/modules/tr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2281,7 +2281,7 @@ const message = {
hostSystem: 'Ana makine günlükleri',
previousPage: 'Önceki sayfa',
nextPage: 'Sonraki sayfa',
filter: 'Filtrele',
filter: 'Mesajları filtrele',
service: 'Servis',
priority: 'Öncelik',
priorityEmergency: 'Acil',
Expand Down Expand Up @@ -3272,7 +3272,7 @@ const message = {
restoreCommunityOfflineHelper:
'Geçerli Enterprise sürümünden eski olmayan resmi bir paketi {path} dizinine yerleştirin. Kullanılabilir bir paket algılandığında geçiş etkinleştirilir.',
restoreCommunityConfirm:
'Geçişten sonra mevcut Enterprise süper yönetici hesabıyla Community Edition sürümüne giriş yapabilirsiniz. Enterprise sürümüne özel veritabanları geçiş sırasında silinecektir.',
'Sürüm değişikliğinden sonra mevcut Enterprise süper yönetici hesabıyla Community Edition sürümüne giriş yapabilirsiniz. Enterprise sürümüne özel veriler geçiş sırasında silinecektir. Lütfen dikkatli ilerleyin.',
restoreCommunityStarting:
'Community Edition hazırlanıyor. Hazır olduğunda panel otomatik olarak yeniden başlatılacaktır.',
levelUpPro: 'Ticari sürüme yükselt',
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/lang/modules/zh-Hant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2119,7 +2119,7 @@ const message = {
hostSystem: '主機日誌',
previousPage: '上一頁',
nextPage: '下一頁',
filter: '篩選',
filter: '訊息篩選',
service: '服務',
priority: '優先級',
priorityEmergency: '緊急 Emergency',
Expand Down Expand Up @@ -3011,7 +3011,8 @@ const message = {
restoreCommunityOnlineHelper: '切換後將自動下載目前版本的社群版安裝包,並清理企業版專屬資料。',
restoreCommunityOfflineHelper:
'請先將版本不低於目前企業版的官方安裝包放入 {path},偵測到可用安裝包後即可執行切換。',
restoreCommunityConfirm: '切換後可使用目前企業版超級管理員帳號登入社群版,切換過程中將刪除企業版專屬資料庫。',
restoreCommunityConfirm:
'版本切換後,可以使用目前企業版超級管理員帳號登入社群版。切換過程中將清除企業版專屬資料,請謹慎操作。',
restoreCommunityStarting: '正在準備社群版,完成後面板將自動重新啟動。',
levelUpPro: '升級商業版',
licenseSync: '許可證同步',
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/lang/modules/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2150,7 +2150,7 @@ const message = {
hostSystem: '主机日志',
previousPage: '上一页',
nextPage: '下一页',
filter: '过滤',
filter: '消息过滤',
service: '服务',
priority: '优先级',
priorityEmergency: '紧急 Emergency',
Expand Down Expand Up @@ -3046,7 +3046,8 @@ const message = {
restoreCommunityPackageMissing: '未检测到可用的社区版离线安装包,暂时无法执行离线恢复。',
restoreCommunityOnlineHelper: '将自动下载当前版本的社区版安装包,完成切换。',
restoreCommunityOfflineHelper: '请先将版本不低于当前企业版的官方安装包放入 {path} 后执行切换。',
restoreCommunityConfirm: '切换后可使用当前企业版超级管理员账号登录社区版,切换过程中将删除企业版专属数据库。',
restoreCommunityConfirm:
'版本切换后,可以使用当前企业版超级管理员账号登录社区版。切换过程中将清除企业版专属数据,请谨慎操作。',
restoreCommunityStarting: '正在准备社区版,完成后面板将自动重启。',
levelUpPro: '升级商业版',
licenseSync: '许可证同步',
Expand Down