Changeset 689 in code

Timestamp:

Nov 15, 2021, 8:40:17 PM (4 years ago)

Author:

contact

Message:

Add panic handlers for user and downstream goroutines

This only brings down a single user or downstream on panic, instead
or bringing down the whole bouncer.

Closes: ​https://todo.sr.ht/~emersion/soju/139

File:

• trunk/server.go (modified) (3 diffs)

trunk/server.go

@@ -10 +10 @@
         "net"
         "net/http"
+        "runtime/debug"
         "sync"
         "sync/atomic"
@@ -164 +165 @@
 
         go func() {
+                defer func() {
+                        if err := recover(); err != nil {
+                                s.Logger.Printf("panic serving user %q: %v\n%v", user.Username, err, debug.Stack())
+                        }
+                }()
+
                 u.run()
 
@@ -179 +186 @@
 
 func (s *Server) handle(ic ircConn) {
+        defer func() {
+                if err := recover(); err != nil {
+                        s.Logger.Printf("panic serving downstream %q: %v\n%v", ic.RemoteAddr(), err, debug.Stack())
+                }
+        }()
+
         atomic.AddInt64(&s.connCount, 1)
         id := atomic.AddUint64(&lastDownstreamID, 1)