1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-09-13 10:04:42 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix the problem that the cache clears deleted log files by mistake (#8135)

Browse source
This commit is contained in:
ssongliu 2025-03-12 22:47:03 +08:00 • committed by GitHub
parent ce22f8a2d8
commit 2dfccdd2a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 45 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
agent/app/repo/task.go
View file

@ -21,6 +21,7 @@ type ITaskRepo interface {
UpdateRunningTaskToFailed() error
CountExecutingTask() (int64, error)
Delete(opts ...DBOption) error
DeleteAll() error
WithByID(id string) DBOption
WithResourceID(id uint) DBOption
@ -118,3 +119,7 @@ func (u TaskRepo) Delete(opts ...DBOption) error {
}
return db.Delete(&model.Task{}).Error
}
func (u TaskRepo) DeleteAll() error {
return global.TaskDB.Where("1 = 1").Delete(&model.Task{}).Error
}

2
agent/app/service/backup.go
View file

@ -247,7 +247,7 @@ func (u *BackupService) Update(req dto.BackupOperate) error {
}
if newBackup.Type == constant.OneDrive || newBackup.Type == constant.GoogleDrive {
if err := loadRefreshTokenByCode(&backup); err != nil {
if err := loadRefreshTokenByCode(&newBackup); err != nil {
return err
}
}

31
agent/app/service/device_clean.go
View file

@ -244,7 +244,7 @@ func (u *DeviceService) Clean(req []dto.Clean) {
continue
}
for _, file := range files {
if file.Name() == "1Panel.log" || file.IsDir() {
if file.Name() == "1Panel-Core.log" || file.Name() == "1Panel.log" || file.IsDir() {
continue
}
dropFileOrDir(path.Join(global.Dir.BaseDir, logPath, file.Name()))
@ -253,10 +253,24 @@ func (u *DeviceService) Clean(req []dto.Clean) {
dropFileOrDir(path.Join(global.Dir.BaseDir, logPath, item.Name))
}
case "task_log":
pathItem := path.Join(global.Dir.BaseDir, logPath, item.Name)
dropFileOrDir(pathItem)
if len(item.Name) != 0 {
_ = taskRepo.Delete(repo.WithByType(item.Name))
if len(item.Name) == 0 {
files, _ := os.ReadDir(path.Join(global.Dir.BaseDir, logPath))
if len(files) == 0 {
continue
}
for _, file := range files {
if file.Name() == "ssl" || !file.IsDir() {
continue
}
dropFileOrDir(path.Join(global.Dir.BaseDir, logPath, file.Name()))
}
_ = taskRepo.DeleteAll()
} else {
pathItem := path.Join(global.Dir.BaseDir, logPath, item.Name)
dropFileOrDir(pathItem)
if len(item.Name) != 0 {
_ = taskRepo.Delete(repo.WithByType(item.Name))
}
}
case "images":
dropImages()
@ -326,7 +340,7 @@ func systemClean(taskItem *task.Task) error {
if logFiles[i].IsDir() {
continue
}
if logFiles[i].Name() != "1Panel.log" {
if logFiles[i].Name() != "1Panel.log" && logFiles[i].Name() != "1Panel-Core.log" {
dropWithTask(path.Join(logPath, logFiles[i].Name()), taskItem, &size, &fileCount)
}
}
@ -591,7 +605,10 @@ func loadTreeWithAllFile(isCheck bool, originalPath, treeType, pathItem string,
return lists
}
for _, file := range files {
if treeType == "system_log" && (file.Name() == "1Panel.log" || file.IsDir()) {
if treeType == "upload" && (file.Name() == "theme" && file.IsDir()) {
continue
}
if treeType == "system_log" && (file.Name() == "1Panel-Core.log" || file.Name() == "1Panel.log" || file.IsDir()) {
continue
}
if (treeType == "upload" || treeType == "download") && file.IsDir() && (file.Name() == "app" || file.Name() == "database" || file.Name() == "website" || file.Name() == "directory") {

10
agent/app/service/snapshot_recover.go
View file

@ -247,10 +247,12 @@ func backupBeforeRecover(name string, itemHelper *snapRecoverHelper) error {
if err != nil {
return err
}
err = itemHelper.FileOp.CopyFile("/etc/docker/daemon.json", baseDir)
itemHelper.Task.LogWithStatus(i18n.GetWithName("SnapCopy", "/etc/docker/daemon.json"), err)
if err != nil {
return err
if itemHelper.FileOp.Stat("/etc/docker/daemon.json") {
err = itemHelper.FileOp.CopyFile("/etc/docker/daemon.json", baseDir)
itemHelper.Task.LogWithStatus(i18n.GetWithName("SnapCopy", "/etc/docker/daemon.json"), err)
if err != nil {
return err
}
}
return nil
}

2
core/app/service/backup.go
View file

@ -211,7 +211,7 @@ func (u *BackupService) Update(req dto.BackupOperate) error {
newBackup.Credential = string(itemCredential)
if newBackup.Type == constant.OneDrive || newBackup.Type == constant.GoogleDrive {
if err := u.loadRefreshTokenByCode(&backup); err != nil {
if err := u.loadRefreshTokenByCode(&newBackup); err != nil {
return err
}
}

5
core/log/writer.go
View file

@ -1,7 +1,6 @@
package log
import (
"github.com/1Panel-dev/1Panel/core/constant"
"log"
"os"
"path"
@ -12,6 +11,8 @@ import (
"time"
"unsafe"
"github.com/1Panel-dev/1Panel/core/constant"
"github.com/1Panel-dev/1Panel/core/global"
)
@ -85,7 +86,7 @@ func NewWriterFromConfig(c *Config) (RollingWriter, error) {
return nil, err
}
filepath := FilePath(c)
file, err := os.OpenFile(filepath, os.O_RDWR|os.O_CREATE|os.O_APPEND, constant.DirPerm)
file, err := os.OpenFile(filepath, os.O_RDWR|os.O_CREATE|os.O_APPEND, constant.FilePerm)
if err != nil {
return nil, err
}

2
frontend/src/views/ai/model/index.vue
View file

@ -175,7 +175,7 @@
<PortJumpDialog ref="dialogPortJumpRef" />
<BindDomain ref="bindDomainRef" />
<TaskLog ref="taskLogRef" width="70%" />
<TaskLog ref="taskLogRef" width="70%" @close="search" />
</div>
</template>

4
frontend/src/views/setting/backup-account/operate/index.vue
View file

@ -570,8 +570,10 @@ const changeType = async () => {
switch (dialogData.value.rowData!.type) {
case 'COS':
case 'OSS':
case 'S3':
dialogData.value.rowData.varsJson['scType'] = 'Standard';
break;
case 'S3':
dialogData.value.rowData.varsJson['scType'] = 'STANDARD';
dialogData.value.rowData.varsJson['mode'] = 'virtual hosted';
break;
case 'KODO':

1
frontend/src/views/toolbox/clean/index.vue
View file

@ -641,6 +641,7 @@ function load18n(label: string) {
case 'Container':
case 'App':
case 'System':
case 'Website':
return i18n.global.t('menu.' + label.toLowerCase());
case 'RuntimeExtension':
return i18n.global.t('website.runtime');