mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2025-01-31 22:18:07 +08:00
fix: 解决网站日志切割备份路径错误的问题 (#3785)
This commit is contained in:
parent
2f7bb6d784
commit
b3852db39e
@ -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
|
||||||
}
|
}
|
||||||
|
@ -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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user