From 53017a7a5ce2ad7da10ad414c0b5513392c4fcb8 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 5 Apr 2023 15:11:36 +0200
Subject: [PATCH] Improve Server.Handle readability

---
 server.go | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/server.go b/server.go
index f96a5e3..d26fab1 100644
--- a/server.go
+++ b/server.go
@@ -455,26 +455,32 @@ func (s *Server) Handle(ic ircConn) {
 	s.lock.Unlock()
 
 	s.metrics.downstreams.Add(1)
+	defer s.metrics.downstreams.Add(-1)
+
 	id := atomic.AddUint64(&lastDownstreamID, 1)
 	dc := newDownstreamConn(s, ic, id)
+	defer dc.Close()
+
 	if shutdown {
 		dc.SendMessage(&irc.Message{
 			Command: "ERROR",
 			Params:  []string{"Server is shutting down"},
 		})
-	} else if err := dc.runUntilRegistered(); err != nil {
+		return
+	}
+
+	if err := dc.runUntilRegistered(); err != nil {
 		if !errors.Is(err, io.EOF) {
 			dc.logger.Printf("%v", err)
 		}
-	} else {
-		dc.user.events <- eventDownstreamConnected{dc}
-		if err := dc.readMessages(dc.user.events); err != nil {
-			dc.logger.Printf("%v", err)
-		}
-		dc.user.events <- eventDownstreamDisconnected{dc}
+		return
 	}
-	dc.Close()
-	s.metrics.downstreams.Add(-1)
+
+	dc.user.events <- eventDownstreamConnected{dc}
+	if err := dc.readMessages(dc.user.events); err != nil {
+		dc.logger.Printf("%v", err)
+	}
+	dc.user.events <- eventDownstreamDisconnected{dc}
 }
 
 func (s *Server) HandleAdmin(ic ircConn) {