Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-03-02 04:02:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix /scren:purge hanging issue

Browse Source
This commit is contained in:
sawka 2023-01-25 14:29:12 -08:00
parent 67ad7d017e
commit 18048a675a
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/sstore/dbops.go
View File

@ -861,26 +861,25 @@ func SwitchScreenById(ctx context.Context, sessionId string, screenId string) (U
}
func cleanSessionCmds(ctx context.Context, sessionId string) error {
txErr := WithTx(context.Background(), func(tx *TxWrap) error {
var removedCmds []string
txErr := WithTx(ctx, func(tx *TxWrap) error {
query := `SELECT cmdid FROM cmd WHERE sessionid = ? AND cmdid NOT IN (SELECT cmdid FROM line WHERE sessionid = ?)`
removedCmds := tx.SelectStrings(query, sessionId, sessionId)
removedCmds = tx.SelectStrings(query, sessionId, sessionId)
query = `DELETE FROM cmd WHERE sessionid = ? AND cmdid NOT IN (SELECT cmdid FROM line WHERE sessionid = ?)`
tx.ExecWrap(query, sessionId, sessionId)
if tx.Err != nil {
return nil
}
for _, cmdId := range removedCmds {
DeletePtyOutFile(tx.Context(), sessionId, cmdId)
}
return nil
})
if txErr != nil {
return txErr
}
for _, cmdId := range removedCmds {
DeletePtyOutFile(ctx, sessionId, cmdId)
}
return nil
}
func CleanWindows(sessionId string) {
// NOTE: context.Background() here! (this could take a long time, and is async)
txErr := WithTx(context.Background(), func(tx *TxWrap) error {
query := `SELECT windowid FROM window WHERE sessionid = ? AND windowid NOT IN (SELECT windowid FROM screen_window WHERE sessionid = ?)`
removedWindowIds := tx.SelectStrings(query, sessionId, sessionId)