From e21458142e98d81fbf2fb89c1837fd4bc890b1c9 Mon Sep 17 00:00:00 2001
From: Frederik Lotter <fred.lotter@canonical.com>
Date: Tue, 1 Aug 2023 15:31:16 +0200
Subject: [PATCH] daemon: remove listener closing race (#253)

---
 internals/daemon/daemon.go | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/internals/daemon/daemon.go b/internals/daemon/daemon.go
index e85fdd02..25455e24 100644
--- a/internals/daemon/daemon.go
+++ b/internals/daemon/daemon.go
@@ -567,17 +567,8 @@ func (d *Daemon) Stop(sigCh chan<- os.Signal) error {
 	restartSocket := d.restartSocket
 	d.mu.Unlock()
 
-	d.generalListener.Close()
 	d.standbyOpinions.Stop()
 
-	if d.untrustedListener != nil {
-		d.untrustedListener.Close()
-	}
-
-	if d.httpListener != nil {
-		d.httpListener.Close()
-	}
-
 	if restartSystem {
 		// give time to polling clients to notice restart
 		time.Sleep(rebootNoticeWait)