cherry-pick "Fix server crash on shutdown due to DB notifications" (#…

…31379) (#2057) Fix server crash on shutdown due to DB notifications (#31379) Fixes #31365 Co-authored-by: Pieter-Jan Briers <[email protected]>
DeltaV-Station · Oct 27, 2024 · c8309ee · c8309ee
1 parent 3a1fa0b
commit c8309ee
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Content.Server/Database/ServerDbPostgres.Notifications.cs b/Content.Server/Database/ServerDbPostgres.Notifications.cs
@@ -97,6 +97,8 @@ private async Task NotificationListener(CancellationToken cancellationToken)
                 _notifyLog.Error($"Error in notification listener: {e}");
             }
         }
+
+        _notificationConnection.Dispose();
     }
 
     private void OnNotification(object _, NpgsqlNotificationEventArgs notification)
@@ -116,6 +118,5 @@ public override void Shutdown()
             return;
 
         _notificationConnection.Notification -= OnNotification;
-        _notificationConnection.Dispose();
     }
 }