Merge pull request #972 from traPtitech/fix/949

fix #949
traPtitech · Jul 11, 2020 · 10d12db · 10d12db
2 parents 5b5423e + 22abd51
commit 10d12db
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/service/ws/session.go b/service/ws/session.go
@@ -89,10 +89,16 @@ func (s *session) writeLoop() {
 	}
 }
 
-func (s *session) writeMessage(msg *rawMessage) error {
+func (s *session) writeMessage(msg *rawMessage) (err error) {
 	if s.closed() {
 		return ErrAlreadyClosed
 	}
+	defer func() {
+		// workaround fix https://github.com/traPtitech/traQ/issues/949
+		if perr := recover(); perr != nil {
+			err = ErrAlreadyClosed
+		}
+	}()
 
 	select {
 	case s.send <- msg: