2
0
mirror of https://github.com/acepanel/panel.git synced 2026-02-07 08:17:14 +08:00

refactor: 重构 tools.Remove 函数

This commit is contained in:
耗子
2023-11-14 02:16:18 +08:00
parent 83cbae034c
commit f7d65fc22e
14 changed files with 80 additions and 35 deletions

View File

@@ -184,7 +184,9 @@ func (s *BackupImpl) MysqlBackup(database string) error {
if _, err := tools.Exec("cd " + backupPath + " && zip -r " + backupPath + "/" + backupFile + ".zip " + backupFile); err != nil {
return err
}
tools.Remove(backupPath + "/" + backupFile)
if err := tools.Remove(backupPath + "/" + backupFile); err != nil {
return err
}
return os.Unsetenv("MYSQL_PWD")
}
@@ -302,8 +304,7 @@ func (s *BackupImpl) PostgresqlBackup(database string) error {
return err
}
tools.Remove(backupPath + "/" + backupFile)
return nil
return tools.Remove(backupPath + "/" + backupFile)
}
// PostgresqlRestore PostgreSQL恢复

View File

@@ -420,7 +420,9 @@ func (r *WebsiteImpl) SaveConfig(config requests.SaveConfig) error {
}
} else {
if tools.Exists(root + ".user.ini") {
tools.Remove(root + ".user.ini")
if err := tools.Remove(root + ".user.ini"); err != nil {
return err
}
}
}
@@ -534,11 +536,21 @@ func (r *WebsiteImpl) Delete(id uint) error {
return err
}
tools.Remove("/www/server/vhost/" + website.Name + ".conf")
tools.Remove("/www/server/vhost/rewrite/" + website.Name + ".conf")
tools.Remove("/www/server/vhost/ssl/" + website.Name + ".pem")
tools.Remove("/www/server/vhost/ssl/" + website.Name + ".key")
tools.Remove(website.Path)
if err := tools.Remove("/www/server/vhost/" + website.Name + ".conf"); err != nil {
return err
}
if err := tools.Remove("/www/server/vhost/rewrite/" + website.Name + ".conf"); err != nil {
return err
}
if err := tools.Remove("/www/server/vhost/ssl/" + website.Name + ".pem"); err != nil {
return err
}
if err := tools.Remove("/www/server/vhost/ssl/" + website.Name + ".key"); err != nil {
return err
}
if err := tools.Remove(website.Path); err != nil {
return err
}
_, err := tools.Exec("systemctl reload openresty")
return err