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

Replace wg with workerpool

Browse Source
This commit is contained in:
Dane Everitt 2020-07-31 21:56:44 -07:00
parent 881cb84605
commit 64df3e168f
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/root.go
View File

@ -3,6 +3,7 @@ package cmd
import ( import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"github.com/gammazero/workerpool"
"net/http" "net/http"
"os" "os"
"path" "path"
@ -21,7 +22,6 @@ import (
"github.com/pterodactyl/wings/server" "github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/sftp" "github.com/pterodactyl/wings/sftp"
"github.com/pterodactyl/wings/system" "github.com/pterodactyl/wings/system"
"github.com/remeh/sizedwaitgroup"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -169,17 +169,15 @@ func rootCmdRun(*cobra.Command, []string) {
log.Warn("server file permission checking is currently disabled on boot!") log.Warn("server file permission checking is currently disabled on boot!")
} }
// Create a new WaitGroup that limits us to 4 servers being bootstrapped at a time // Create a new workerpool that limits us to 4 servers being bootstrapped at a time
// on Wings. This allows us to ensure the environment exists, write configurations, // on Wings. This allows us to ensure the environment exists, write configurations,
// and reboot processes without causing a slow-down due to sequential booting. // and reboot processes without causing a slow-down due to sequential booting.
wg := sizedwaitgroup.New(4) pool := workerpool.New(4)
for _, serv := range server.GetServers().All() { for _, serv := range server.GetServers().All() {
wg.Add() s := serv
go func(s *server.Server) {
defer wg.Done()
pool.Submit(func() {
if c.System.SetPermissionsOnBoot { if c.System.SetPermissionsOnBoot {
s.Log().Info("chowning server data directory") s.Log().Info("chowning server data directory")
if err := s.Filesystem.Chown("/"); err != nil { if err := s.Filesystem.Chown("/"); err != nil {
@ -217,11 +215,11 @@ func rootCmdRun(*cobra.Command, []string) {
// Addresses potentially invalid data in the stored file that can cause Wings to lose // Addresses potentially invalid data in the stored file that can cause Wings to lose
// track of what the actual server state is. // track of what the actual server state is.
s.SetState(server.ProcessOfflineState) s.SetState(server.ProcessOfflineState)
}(serv) })
} }
// Wait until all of the servers are ready to go before we fire up the HTTP server. // Wait until all of the servers are ready to go before we fire up the HTTP server.
wg.Wait() pool.StopWait()
// Initalize SFTP. // Initalize SFTP.
sftp.Initialize(c) sftp.Initialize(c)