Move panic handler

diff --git a/hotline/panic.go b/hotline/panic.go
new file mode 100644 (file)
index 0000000..e7c97db
--- /dev/null
+++ b/hotline/panic.go
@@ -0,0 +1,15 @@
+package hotline
+
+import (
+       "fmt"
+       "go.uber.org/zap"
+       "runtime/debug"
+)
+
+// dontPanic logs panics instead of crashing
+func dontPanic(logger *zap.SugaredLogger) {
+       if r := recover(); r != nil {
+               fmt.Println("stacktrace from panic: \n" + string(debug.Stack()))
+               logger.Errorw("PANIC", "err", r, "trace", string(debug.Stack()))
+       }
+}

diff --git a/hotline/server.go b/hotline/server.go
index 1fafb30b2a929ec28ebbd9e6d75ad9d2f925eb57..ccf992e2a68eeff39043055e3d7dc6f4861f2693 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -18,7 +18,6 @@ import (
        "net"
        "os"
        "path/filepath"
        "net"
        "os"
        "path/filepath"

-       "runtime/debug"

        "strings"
        "sync"
        "time"
        "strings"
        "sync"
        "time"


@@ -542,14 +541,6 @@ func (s *Server) loadConfig(path string) error {
        return nil
 }
 
        return nil
 }
 

-// dontPanic logs panics instead of crashing
-func dontPanic(logger *zap.SugaredLogger) {
-       if r := recover(); r != nil {
-               fmt.Println("stacktrace from panic: \n" + string(debug.Stack()))
-               logger.Errorw("PANIC", "err", r, "trace", string(debug.Stack()))
-       }
-}
-

 // handleNewConnection takes a new net.Conn and performs the initial login sequence
 func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser, remoteAddr string) error {
        defer dontPanic(s.Logger)
 // handleNewConnection takes a new net.Conn and performs the initial login sequence
 func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser, remoteAddr string) error {
        defer dontPanic(s.Logger)