From 082084dd13e98e7ec84dc62160a30a39c0a32509 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 20 Sep 2021 21:40:29 +1200 Subject: [PATCH] Colour logs, check server jar exists --- src/main.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main.go b/src/main.go index 46f4425..ddc02df 100644 --- a/src/main.go +++ b/src/main.go @@ -16,7 +16,7 @@ import ( ) func main() { - log.Println("Starting Server") + log.Println("\033[32mStarting Server") sigs := make(chan os.Signal, 1) signal.Notify(sigs, syscall.SIGTERM) @@ -37,13 +37,21 @@ func main() { } } - log.Printf("Ram: Min: %s Max: %s Stop: %s Jar: %s\n\rArgs: %s", minram, maxram, stop, jar, args) + log.Printf("Ram: Min: %s Max: %s Stop: %s Jar: %s\n\r", minram, maxram, stop, jar) + + + + if _, err := os.Stat("/server/"+jar); os.IsNotExist(err) { + log.Println("\033[31mJar \"" + jar + "\" not found") + os.Exit(1) + } var cmd *exec.Cmd if args == "" { cmd = exec.Command("java", minram, maxram, "-jar", jar) } else { cmd = exec.Command("java", minram, maxram, args, "-jar", jar) + log.Printf("Args: %s \n\r", args) } cmd.Dir = "/server" @@ -53,6 +61,7 @@ func main() { if err != nil { panic(err) + } defer func() { @@ -65,7 +74,7 @@ func main() { go func() { sig := <-sigs if sig == syscall.SIGTERM { - fmt.Println("Stopping server") + fmt.Println("\033[31mStopping server") tty.WriteString(stop + "\n\r") } }() @@ -86,7 +95,7 @@ func main() { }() cmd.Wait() - tty.Write([]byte("Server Stopped")) + tty.Write([]byte("\033[31mServer Stopped")) os.Exit(0) }