Merge branch 'develop' of https://github.com/pterodactyl/wings into develop

This commit is contained in:
Dane Everitt 2020-11-29 11:48:03 -08:00
commit 97345123ce
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53

View File

@ -242,11 +242,11 @@ func postTransfer(c *gin.Context) {
"error": err, "error": err,
}).Warn("failed to delete transfer archive") }).Warn("failed to delete transfer archive")
} else { } else {
l.WithField("server", serverID).Debug("deleted temporary transfer archive successfully") l.Debug("deleted temporary transfer archive successfully")
} }
}() }()
l.WithField("server", serverID).Debug("server archive downloaded, computing checksum...") l.Debug("server archive downloaded, computing checksum...")
// Open the archive file for computing a checksum. // Open the archive file for computing a checksum.
file, err = os.Open(archivePath) file, err = os.Open(archivePath)
@ -325,7 +325,7 @@ func postTransfer(c *gin.Context) {
return return
} }
l.WithField("server", serverID).Info("successfully notified panel of transfer success") l.Info("successfully notified panel of transfer success")
}(buf.Bytes()) }(buf.Bytes())
c.Status(http.StatusAccepted) c.Status(http.StatusAccepted)