Correctly return servers installed on wings and their resource usage

This commit is contained in:
Dane Everitt 2021-04-03 11:08:26 -07:00
parent b691b8f06f
commit b448310a33
2 changed files with 15 additions and 10 deletions

View File

@ -10,6 +10,7 @@ import (
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/installer"
"github.com/pterodactyl/wings/router/middleware"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/system"
)
@ -28,15 +29,20 @@ func getSystemInformation(c *gin.Context) {
// Returns all of the servers that are registered and configured correctly on
// this wings instance.
func getAllServers(c *gin.Context) {
servers := middleware.ExtractManager(c).All()
var procData []serverProcData
for _, v := range servers {
procData = append(procData, serverProcData{
ResourceUsage: v.Proc(),
Suspended: v.IsSuspended(),
})
type serverItem struct {
*server.Configuration
Resources server.ResourceUsage `json:"resources"`
}
c.JSON(http.StatusOK, procData)
servers := middleware.ExtractManager(c).All()
out := make([]serverItem, len(servers), len(servers))
for i, v := range servers {
out[i] = serverItem{
Configuration: v.Config(),
Resources: v.Proc(),
}
}
c.JSON(http.StatusOK, out)
}
// Creates a new server on the wings daemon and begins the installation process

View File

@ -8,7 +8,7 @@ import (
type EggConfiguration struct {
// The internal UUID of the Egg on the Panel.
ID string
ID string `json:"id"`
// Maintains a list of files that are blacklisted for opening/editing/downloading
// or basically any type of access on the server by any user. This is NOT the same
@ -43,7 +43,6 @@ type Configuration struct {
Build environment.Limits `json:"build"`
CrashDetectionEnabled bool `default:"true" json:"enabled" yaml:"enabled"`
Mounts []Mount `json:"mounts"`
Resources ResourceUsage `json:"resources"`
Egg EggConfiguration `json:"egg,omitempty"`
Container struct {