MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't allow a reinstall while server is processing a power action; closes pterodactyl/panel#2409

Browse Source
This commit is contained in:
Dane Everitt 2020-09-25 20:03:04 -07:00
parent ae5005baa3
commit fb24ad58b4
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
router/router_server.go
View File

@ -169,9 +169,16 @@ func postServerInstall(c *gin.Context) {
func postServerReinstall(c *gin.Context) { func postServerReinstall(c *gin.Context) {
s := GetServer(c.Param("server")) s := GetServer(c.Param("server"))
go func(serv *server.Server) { if s.ExecutingPowerAction() {
if err := serv.Reinstall(); err != nil { c.AbortWithStatusJSON(http.StatusConflict, gin.H{
serv.Log().WithField("error", err).Error("failed to complete server re-install process") "error": "Cannot execute server reinstall event while another power action is running.",
})
return
}
go func(s *server.Server) {
if err := s.Reinstall(); err != nil {
s.Log().WithField("error", err).Error("failed to complete server re-install process")
} }
}(s) }(s)

2
server/power.go
View File

@ -168,7 +168,7 @@ func (s *Server) onBeforeStart() error {
} else { } else {
s.PublishConsoleOutputFromDaemon("Checking server disk space usage, this could take a few seconds...") s.PublishConsoleOutputFromDaemon("Checking server disk space usage, this could take a few seconds...")
if !s.Filesystem.HasSpaceAvailable(false) { if !s.Filesystem.HasSpaceAvailable(false) {
return errors.New("cannot start server, not enough disk space available") return ErrNotEnoughDiskSpace
} }
} }