Skip to content
/ wings Public

Fix failed transfer file cleanup #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrSoulPenguin wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix failed transfer file cleanup #298

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions router/router_transfer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,32 +93,32 @@ func postTransfers(c *gin.Context) {
// Remove the transfer from the list of incoming transfers.
transfer.Incoming().Remove(trnsfr)

status := "success"
if !successful {
trnsfr.Server.Events().Publish(server.TransferStatusEvent, "failure")
status = "failure"

manager.Remove(func(match *server.Server) bool {
return match.ID() == trnsfr.Server.ID()
})
}

if err := manager.Client().SetTransferStatus(context.Background(), trnsfr.Server.ID(), successful); err != nil {
// Only delete the files if the transfer actually failed, otherwise we could have
// unrecoverable data-loss.
if !successful && err != nil {
// Delete all extracted files.
go func(trnsfr *transfer.Transfer) {
_ = trnsfr.Server.Filesystem().UnixFS().Close()
if err := os.RemoveAll(trnsfr.Server.Filesystem().Path()); err != nil && !os.IsNotExist(err) {
trnsfr.Log().WithError(err).Warn("failed to delete local server files")
}
}(trnsfr)
}
go func(trnsfr *transfer.Transfer) {
trnsfr.Log().Debug("cleaning up leftover files")

_ = trnsfr.Server.Filesystem().UnixFS().Close()
if err := os.RemoveAll(trnsfr.Server.Filesystem().Path()); err != nil && !os.IsNotExist(err) {
trnsfr.Log().WithError(err).Warn("failed to delete local server files")
}
}(trnsfr)
}

trnsfr.Log().WithField("status", successful).WithError(err).Error("failed to set transfer status on panel")
return
if err := manager.Client().SetTransferStatus(context.Background(), trnsfr.Server.ID(), successful); err != nil {
trnsfr.Log().WithField("status", status).WithError(err).Error("failed to set transfer status on panel")
}

trnsfr.Server.SetTransferring(false)
trnsfr.Server.Events().Publish(server.TransferStatusEvent, "success")
trnsfr.Server.Events().Publish(server.TransferStatusEvent, status)
}(ctx, trnsfr)

mediaType, params, err := mime.ParseMediaType(c.GetHeader("Content-Type"))
Expand Down