github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 解决网站日志切割备份路径错误的问题 (#3785)

pull/3797/head
ssongliu 2024-02-01 23:54:59 +08:00 committed by GitHub
parent 2f7bb6d784
commit b3852db39e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/app/api/v1/terminal.go
View File

@ -105,7 +105,7 @@ func (b *BaseApi) RedisWsSsh(c *gin.Context) {
defer killBash(redisConf.ContainerName, commands, pidMap) defer killBash(redisConf.ContainerName, commands, pidMap)
defer slave.Close() defer slave.Close()
tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, true) tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, false)
if wshandleError(wsConn, err) { if wshandleError(wsConn, err) {
return return
} }
@ -173,7 +173,7 @@ func (b *BaseApi) ContainerWsSsh(c *gin.Context) {
defer killBash(containerID, command, pidMap) defer killBash(containerID, command, pidMap)
defer slave.Close() defer slave.Close()
tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, false) tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, true)
if wshandleError(wsConn, err) { if wshandleError(wsConn, err) {
return return
} }

1
backend/app/service/backup.go
View File

@ -341,6 +341,7 @@ func (u *BackupService) Update(req dto.BackupOperate) error {
_ = backupRepo.Update(req.ID, (map[string]interface{}{"vars": oldVars})) _ = backupRepo.Update(req.ID, (map[string]interface{}{"vars": oldVars}))
return err return err
} }
global.CONF.System.Backup = dirStr
} }
} }
} }