[#389686] Show crash output in console

server/crash.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"fmt"
 	"github.com/pkg/errors"
 	"github.com/pterodactyl/wings/config"
 	"go.uber.org/zap"
@@ -33,8 +34,10 @@ func (s *Server) handleServerCrash() error {
 	// is no reason to do a crash detection event. If the server crash detection is
 	// disabled we want to skip anything after this as well.
 	if s.State != ProcessOfflineState || !s.CrashDetection.Enabled {
-		if s.CrashDetection.Enabled {
+		if !s.CrashDetection.Enabled {
 			zap.S().Debugw("server triggered crash detection but handler is disabled for server process", zap.String("server", s.Uuid))
+
+			s.SendConsoleOutputFromDaemon("Server detected as crashed; crash detection is disabled for this instance.")
 		}
 
 		return nil
@@ -53,10 +56,16 @@ func (s *Server) handleServerCrash() error {
 		return nil
 	}
 
+	s.SendConsoleOutputFromDaemon("---------- Detected server process in a crashed state! ----------")
+	s.SendConsoleOutputFromDaemon(fmt.Sprintf("Exit code: %d", exitCode))
+	s.SendConsoleOutputFromDaemon(fmt.Sprintf("Out of memory: %t", oomKilled))
+
 	c := s.CrashDetection.lastCrash
 	// If the last crash time was within the last 60 seconds we do not want to perform
 	// an automatic reboot of the process. Return an error that can be handled.
 	if !c.IsZero() && c.Add(time.Second * 60).After(time.Now()) {
+		s.SendConsoleOutputFromDaemon("Aborting automatic reboot: last crash occurred less than 60 seconds ago.")
+
 		return &crashTooFrequent{}
 	}
 

server/events.go

@@ -1,5 +1,10 @@
 package server
 
+import (
+	"fmt"
+	"github.com/mitchellh/colorstring"
+)
+
 type EventListeners map[string][]EventListenerFunction
 
 type EventListenerFunction *func(string)
@@ -8,8 +13,8 @@ type EventListenerFunction *func(string)
 // noinspection GoNameStartsWithPackageName
 const (
 	ConsoleOutputEvent = "console output"
-	StatusEvent = "status"
-	StatsEvent = "stats"
+	StatusEvent        = "status"
+	StatsEvent         = "stats"
 )
 
 // Adds an event listener for the server instance.
@@ -41,9 +46,18 @@ func (s *Server) RemoveListener(event string, f EventListenerFunction) {
 func (s *Server) Emit(event string, data string) {
 	if _, ok := s.listeners[event]; ok {
 		for _, handler := range s.listeners[event] {
-			go func (f EventListenerFunction, d string) {
+			go func(f EventListenerFunction, d string) {
 				(*f)(d)
 			}(handler, data)
 		}
 	}
-}
+}
+
+// Sends output to the server console formatted to appear correctly as being sent
+// from Wings.
+func (s *Server) SendConsoleOutputFromDaemon(data string) {
+	s.Emit(
+		ConsoleOutputEvent,
+		colorstring.Color(fmt.Sprintf("[yellow][bold][Pterodactyl Daemon]:[default] %s", data)),
+	)
+}