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

Merge pull request #45 from pterodactyl/fix/disk-usage

Browse Source 
Force disk usage calculation when loading servers
This commit is contained in:
Dane Everitt 2020-07-31 20:06:58 -07:00 committed by GitHub
commit 5889d0585b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/loader.go
View File

@ -7,6 +7,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pterodactyl/wings/api" "github.com/pterodactyl/wings/api"
"github.com/remeh/sizedwaitgroup" "github.com/remeh/sizedwaitgroup"
"os"
"time" "time"
) )
@ -111,6 +112,11 @@ func FromConfiguration(data *api.ServerConfigurationResponse) (*Server, error) {
Server: s, Server: s,
} }
// If the server's data directory exists, force disk usage calculation.
if _, err := os.Stat(s.Filesystem.Path()); err == nil {
go s.Filesystem.HasSpaceAvailable()
}
// Forces the configuration to be synced with the panel. // Forces the configuration to be synced with the panel.
if err := s.SyncWithConfiguration(data); err != nil { if err := s.SyncWithConfiguration(data); err != nil {
return nil, err return nil, err

2
server/server.go
View File

@ -158,7 +158,7 @@ func (s *Server) GetProcessConfiguration() (*api.ServerConfigurationResponse, *a
return api.NewRequester().GetServerConfiguration(s.Id()) return api.NewRequester().GetServerConfiguration(s.Id())
} }
// Helper function that can receieve a power action and then process the // Helper function that can receive a power action and then process the
// actions that need to occur for it. // actions that need to occur for it.
func (s *Server) HandlePowerAction(action PowerAction) error { func (s *Server) HandlePowerAction(action PowerAction) error {
switch action.Action { switch action.Action {