From ebcce68b6095ca9766641ce5dc00aae01d61de06 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 19 Jun 2026 16:25:36 +0100
Subject: Move server restart logic to the core.

- Properly clean up the process with Cleanup() instead of using
- DieRestart.

- Use close_range on modern Linux instead of the CLOEXEC hack.
---
 modules/spanningtree/main.cpp | 2 +-
 modules/spanningtree/main.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/spanningtree')

diff --git a/modules/spanningtree/main.cpp b/modules/spanningtree/main.cpp
index 5cd582fe0..6a3bf5495 100644
--- a/modules/spanningtree/main.cpp
+++ b/modules/spanningtree/main.cpp
@@ -854,7 +854,7 @@ void ModuleSpanningTree::OnMode(User* source, User* u, Channel* c, const Modes::
 	}
 }
 
-void ModuleSpanningTree::OnShutdown(const std::string& reason)
+void ModuleSpanningTree::OnShutdown(const std::string& reason, bool restarting)
 {
 	const TreeServer::ChildServers& children = Utils->TreeRoot->GetChildren();
 	while (!children.empty())
diff --git a/modules/spanningtree/main.h b/modules/spanningtree/main.h
index a1d114991..5b2e2d882 100644
--- a/modules/spanningtree/main.h
+++ b/modules/spanningtree/main.h
@@ -186,7 +186,7 @@ public:
 	void OnUnloadModule(const ModulePtr& mod) override;
 	ModResult OnAcceptConnection(int newsock, ListenSocket* from, const irc::sockets::sockaddrs& client, const irc::sockets::sockaddrs& server) override;
 	void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) override;
-	void OnShutdown(const std::string& reason) override;
+	void OnShutdown(const std::string& reason, bool restarting) override;
 	void OnDecodeMetadata(Extensible* target, const std::string& extname, const std::string& extdata) override;
 	Cullable::Result Cull() override;
 	~ModuleSpanningTree() override;
-- 
cgit v1.3.1-10-gc9f91