Merge pull request #39 from systemli/connection-closing

♻️ Ensure connections are closed properly in handlers

Author: 0x46616c6b

adapter.go

@@ -53,6 +53,11 @@ func NewPostfixAdapter(client UserliService) *PostfixAdapter {
 // It fetches the destinations for the given alias.
 // The response is a comma separated list of destinations.
 func (p *PostfixAdapter) AliasHandler(conn net.Conn) {
+	defer func() {
+		if err := conn.Close(); err != nil {
+			log.WithError(err).Error("Error closing connection")
+		}
+	}()
 	now := time.Now()
 
 	payload, err := p.payload(conn)
@@ -80,6 +85,11 @@ func (p *PostfixAdapter) AliasHandler(conn net.Conn) {
 // It checks if the domain exists.
 // The response is a single line with the status code.
 func (p *PostfixAdapter) DomainHandler(conn net.Conn) {
+	defer func() {
+		if err := conn.Close(); err != nil {
+			log.WithError(err).Error("Error closing connection")
+		}
+	}()
 	now := time.Now()
 
 	payload, err := p.payload(conn)
@@ -108,6 +118,11 @@ func (p *PostfixAdapter) DomainHandler(conn net.Conn) {
 // It checks if the mailbox exists.
 // The response is a single line with the status code.
 func (p *PostfixAdapter) MailboxHandler(conn net.Conn) {
+	defer func() {
+		if err := conn.Close(); err != nil {
+			log.WithError(err).Error("Error closing connection")
+		}
+	}()
 	now := time.Now()
 
 	payload, err := p.payload(conn)
@@ -136,6 +151,11 @@ func (p *PostfixAdapter) MailboxHandler(conn net.Conn) {
 // It fetches the senders for the given email.
 // The response is a comma separated list of senders.
 func (p *PostfixAdapter) SendersHandler(conn net.Conn) {
+	defer func() {
+		if err := conn.Close(); err != nil {
+			log.WithError(err).Error("Error closing connection")
+		}
+	}()
 	now := time.Now()
 
 	payload, err := p.payload(conn)

server.go

@@ -40,15 +40,6 @@ func StartTCPServer(ctx context.Context, wg *sync.WaitGroup, addr string, handle
 			continue
 		}
 
-		go func() {
-			defer func() {
-				log.Debug("Closing connection")
-				if err := conn.Close(); err != nil {
-					log.WithError(err).Error("Error closing connection")
-				}
-			}()
-
-			handler(conn)
-		}()
+		go handler(conn)
 	}
 }