Please enter the commit message for your changes. Lines starting

with '#' will be ignored, and an empty message aborts the commit.

 Author:    Ethan Alicea <64653625+Tech-Gamer@users.noreply.github.com>

 On branch develop
 Your branch is up to date with 'origin/develop'.

 Changes to be committed:
	modified:   .github/workflows/push.yaml
	modified:   .github/workflows/release.yaml
	modified:   CHANGELOG.md
	modified:   Dockerfile
	modified:   Makefile
	modified:   README.md
	modified:   cmd/configure.go
	modified:   cmd/diagnostics.go
	modified:   cmd/root.go
	modified:   config/config.go
	modified:   environment/allocations.go
	modified:   environment/docker.go
	modified:   environment/docker/api.go
	modified:   environment/docker/container.go
	modified:   environment/docker/environment.go
	modified:   environment/docker/power.go
	modified:   environment/docker/stats.go
	modified:   environment/environment.go
	modified:   environment/settings.go
	modified:   events/events.go
	modified:   go.mod
	modified:   internal/cron/activity_cron.go
	modified:   internal/cron/cron.go
	modified:   internal/cron/sftp_cron.go
	modified:   internal/database/database.go
	modified:   internal/progress/progress.go
	modified:   internal/progress/progress_test.go
	modified:   loggers/cli/cli.go
	new file:   oryxBuildBinary
	modified:   parser/parser.go
	modified:   remote/http.go
	modified:   remote/servers.go
	modified:   remote/types.go
	modified:   router/downloader/downloader.go
	modified:   router/middleware.go
	modified:   router/middleware/middleware.go
	modified:   router/middleware/request_error.go
	modified:   router/router.go
	modified:   router/router_download.go
	modified:   router/router_server.go
	modified:   router/router_server_backup.go
	modified:   router/router_server_files.go
	modified:   router/router_server_transfer.go
	modified:   router/router_server_ws.go
	modified:   router/router_system.go
	modified:   router/router_transfer.go
	modified:   router/tokens/parser.go
	modified:   router/websocket/listeners.go
	modified:   router/websocket/websocket.go
	modified:   server/activity.go
	modified:   server/backup.go
	modified:   server/backup/backup.go
	modified:   server/backup/backup_local.go
	modified:   server/backup/backup_s3.go
	modified:   server/configuration.go
	modified:   server/console.go
	modified:   server/crash.go
	modified:   server/events.go
	modified:   server/filesystem/archive.go
	modified:   server/filesystem/filesystem.go
	modified:   server/filesystem/filesystem_test.go
	modified:   server/install.go
	modified:   server/installer/installer.go
	modified:   server/listeners.go
	modified:   server/manager.go
	modified:   server/mounts.go
	modified:   server/power.go
	modified:   server/power_test.go
	modified:   server/resources.go
	modified:   server/server.go
	modified:   server/transfer/archive.go
	modified:   server/transfer/source.go
	modified:   server/transfer/transfer.go
	modified:   server/update.go
	modified:   sftp/event.go
	modified:   sftp/handler.go
	modified:   sftp/server.go
	modified:   wings.go
This commit is contained in:
Ethan Alicea
2023-09-11 17:22:09 +00:00
committed by GitHub
parent 438e5fdbe9
commit 4390bad36b
78 changed files with 198 additions and 197 deletions

View File

@@ -6,8 +6,8 @@ import (
"emperror.dev/errors"
"github.com/pterodactyl/wings/internal/database"
"github.com/pterodactyl/wings/internal/models"
"github.com/Tech-Gamer/nwy-wings/internal/database"
"github.com/Tech-Gamer/nwy-wings/internal/models"
)
const ActivityPowerPrefix = "server:power."

View File

@@ -10,9 +10,9 @@ import (
"github.com/apex/log"
"github.com/docker/docker/client"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server/backup"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server/backup"
)
// Notifies the panel of a backup's state and returns an error if one is encountered

View File

@@ -14,8 +14,8 @@ import (
"github.com/mholt/archiver/v4"
"golang.org/x/sync/errgroup"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/remote"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/remote"
)
var format = archiver.CompressedArchive{

View File

@@ -9,9 +9,9 @@ import (
"github.com/juju/ratelimit"
"github.com/mholt/archiver/v4"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
)
type LocalBackup struct {

View File

@@ -14,9 +14,9 @@ import (
"github.com/juju/ratelimit"
"github.com/mholt/archiver/v4"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
)
type S3Backup struct {

View File

@@ -3,7 +3,7 @@ package server
import (
"sync"
"github.com/pterodactyl/wings/environment"
"github.com/Tech-Gamer/nwy-wings/environment"
)
type EggConfiguration struct {

View File

@@ -7,8 +7,8 @@ import (
"github.com/mitchellh/colorstring"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/system"
)
// appName is a local cache variable to avoid having to make expensive copies of

View File

@@ -8,8 +8,8 @@ import (
"emperror.dev/errors"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
)
type CrashHandler struct {
@@ -70,6 +70,7 @@ func (s *Server) handleServerCrash() error {
}
s.PublishConsoleOutputFromDaemon("---------- Detected server process in a crashed state! ----------")
s.PublishConsoleOutputFromDaemon("---------- If you need help, please contact Nightway Hosting support. ----------")
s.PublishConsoleOutputFromDaemon(fmt.Sprintf("Exit code: %d", exitCode))
s.PublishConsoleOutputFromDaemon(fmt.Sprintf("Out of memory: %t", oomKilled))

View File

@@ -1,8 +1,8 @@
package server
import (
"github.com/pterodactyl/wings/events"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/events"
"github.com/Tech-Gamer/nwy-wings/system"
)
// Defines all the possible output events for a server.

View File

@@ -18,8 +18,8 @@ import (
"github.com/klauspost/pgzip"
ignore "github.com/sabhiram/go-gitignore"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/internal/progress"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/internal/progress"
)
const memory = 4 * 1024

View File

@@ -19,8 +19,8 @@ import (
"github.com/karrick/godirwalk"
ignore "github.com/sabhiram/go-gitignore"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/system"
)
type Filesystem struct {

View File

@@ -13,7 +13,7 @@ import (
. "github.com/franela/goblin"
"github.com/pterodactyl/wings/config"
"github.com/Tech-Gamer/nwy-wings/config"
)
func NewFs() (*Filesystem, *rootFs) {

View File

@@ -19,10 +19,10 @@ import (
"github.com/docker/docker/api/types/mount"
"github.com/docker/docker/client"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/system"
)
// Install executes the installation stack for a server process. Bubbles any

View File

@@ -6,8 +6,8 @@ import (
"emperror.dev/errors"
"github.com/asaskevich/govalidator"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server"
)
type Installer struct {

View File

@@ -9,11 +9,11 @@ import (
"github.com/apex/log"
"github.com/pterodactyl/wings/events"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/events"
"github.com/Tech-Gamer/nwy-wings/system"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/remote"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/remote"
)
var dockerEvents = []string{

View File

@@ -15,11 +15,11 @@ import (
"github.com/gammazero/workerpool"
"github.com/goccy/go-json"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/environment/docker"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/environment/docker"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
)
type Manager struct {

View File

@@ -6,8 +6,8 @@ import (
"github.com/apex/log"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
)
// To avoid confusion when working with mounts, assume that a server.Mount has not been properly

View File

@@ -9,8 +9,8 @@ import (
"emperror.dev/errors"
"github.com/google/uuid"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
)
type PowerAction string

View File

@@ -5,7 +5,7 @@ import (
. "github.com/franela/goblin"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/system"
)
func TestPower(t *testing.T) {

View File

@@ -4,8 +4,8 @@ import (
"sync"
"sync/atomic"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/system"
)
// ResourceUsage defines the current resource usage for a given server instance. If a server is offline you

View File

@@ -13,12 +13,12 @@ import (
"github.com/creasty/defaults"
"github.com/goccy/go-json"
"github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/environment"
"github.com/pterodactyl/wings/events"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/config"
"github.com/Tech-Gamer/nwy-wings/environment"
"github.com/Tech-Gamer/nwy-wings/events"
"github.com/Tech-Gamer/nwy-wings/remote"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/system"
)
// Server is the high level definition for a server instance being controlled

View File

@@ -5,8 +5,8 @@ import (
"fmt"
"io"
"github.com/pterodactyl/wings/internal/progress"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/Tech-Gamer/nwy-wings/internal/progress"
"github.com/Tech-Gamer/nwy-wings/server/filesystem"
)
// Archive returns an archive that can be used to stream the contents of the

View File

@@ -11,7 +11,7 @@ import (
"net/http"
"time"
"github.com/pterodactyl/wings/internal/progress"
"github.com/Tech-Gamer/nwy-wings/internal/progress"
)
// PushArchiveToTarget POSTs the archive to the target node and returns the

View File

@@ -7,8 +7,8 @@ import (
"github.com/apex/log"
"github.com/mitchellh/colorstring"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/system"
"github.com/Tech-Gamer/nwy-wings/server"
"github.com/Tech-Gamer/nwy-wings/system"
)
// Status represents the current status of a transfer.

View File

@@ -3,9 +3,9 @@ package server
import (
"time"
"github.com/pterodactyl/wings/environment/docker"
"github.com/Tech-Gamer/nwy-wings/environment/docker"
"github.com/pterodactyl/wings/environment"
"github.com/Tech-Gamer/nwy-wings/environment"
)
// SyncWithEnvironment updates the environment for the server to match any of