From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 10 Apr 2013 22:24:33 +0000 (+0200)
Subject: Move stopping into ServerPool.
X-Git-Tag: 1.0.0~151
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=d9b0536b128e10447a986f7b6ea2b5c93252c80f

Move stopping into ServerPool.
---

diff --git a/main.cpp b/main.cpp
index 1979bb3..1f7313a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -396,9 +396,7 @@ int main(int argc, char **argv)
 	for (size_t i = 0; i < inputs.size(); ++i) {
 		inputs[i]->stop();
 	}
-	for (int i = 0; i < num_servers; ++i) {	
-		servers->get_server(i)->stop();
-	}
+	servers->stop();
 
 	fprintf(stderr, "Serializing state and re-execing...\n");
 	int state_fd = make_tempfile(collect_state(
diff --git a/serverpool.cpp b/serverpool.cpp
index 09fe435..cf6933c 100644
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -59,6 +59,13 @@ void ServerPool::run()
 	}
 }
 	
+void ServerPool::stop()
+{
+	for (int i = 0; i < num_servers; ++i) {
+		servers[i].stop();
+	}
+}
+	
 vector<ClientStats> ServerPool::get_client_stats() const
 {
 	vector<ClientStats> ret;
diff --git a/serverpool.h b/serverpool.h
index c22fb67..5dee5f7 100644
--- a/serverpool.h
+++ b/serverpool.h
@@ -35,6 +35,9 @@ public:
 	// Starts all the servers.
 	void run();
 
+	// Stops all the servers.
+	void stop();
+
 	std::vector<ClientStats> get_client_stats() const;
 
 private: