Ensuring done channel cannot be closed twice

dannykopping · dannykopping · commit 5bffd2677454 · 2024-10-01T12:24:30.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/notifications/manager.go b/coderd/notifications/manager.go
@@ -54,6 +54,7 @@ type Manager struct {
 
 	runOnce  sync.Once
 	stopOnce sync.Once
+	doneOnce sync.Once
 	stop     chan any
 	done     chan any
 
@@ -153,9 +154,9 @@ func (m *Manager) Run(ctx context.Context) {
 // events, creating a notifier, and publishing bulk dispatch result updates to the store.
 func (m *Manager) loop(ctx context.Context) error {
 	defer func() {
-		if m.notifier != nil {
+		m.doneOnce.Do(func() {
 			close(m.done)
-		}
+		})
 		m.log.Info(context.Background(), "notification manager stopped")
 	}()
 
@@ -363,11 +364,13 @@ func (m *Manager) Stop(ctx context.Context) error {
 
 		m.log.Info(context.Background(), "graceful stop requested")
 
+		m.doneOnce.Do(func() {
+			close(m.done)
+		})
+
 		// If the notifier hasn't been started, we don't need to wait for anything.
 		// This is only really during testing when we want to enqueue messages only but not deliver them.
-		if m.notifier == nil {
-			close(m.done)
-		} else {
+		if m.notifier != nil {
 			m.notifier.stop()
 		}
 
diff --git a/site/src/pages/DeploySettingsPage/Sidebar.tsx b/site/src/pages/DeploySettingsPage/Sidebar.tsx
@@ -7,14 +7,14 @@ import NotificationsIcon from "@mui/icons-material/NotificationsNoneOutlined";
 import Globe from "@mui/icons-material/PublicOutlined";
 import ApprovalIcon from "@mui/icons-material/VerifiedUserOutlined";
 import VpnKeyOutlined from "@mui/icons-material/VpnKeyOutlined";
+import { FeatureStageBadge } from "components/FeatureStageBadge/FeatureStageBadge";
 import { GitIcon } from "components/Icons/GitIcon";
 import {
 	Sidebar as BaseSidebar,
 	SidebarNavItem,
 } from "components/Sidebar/Sidebar";
 import { useDashboard } from "modules/dashboard/useDashboard";
 import type { FC } from "react";
-import { FeatureStageBadge } from "components/FeatureStageBadge/FeatureStageBadge";
 
 export const Sidebar: FC = () => {
 	const { experiments } = useDashboard();
