Move stopping into ServerPool.

diff --git a/main.cpp b/main.cpp
index 1979bb3ca8ca50b10e1a8b203cb68c0c57870c8e..1f7313ac0eb6c013648d7edafff1e93b99902460 100644 (file)
--- 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 09fe4355fbb4b6fcdc2748c473838cb2f9a2fa84..cf6933ccda181e23f4f7f7d85e353ec11b7d805a 100644 (file)
--- 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 c22fb67462644f053da8ca0170fc21afebd1c931..5dee5f778e8a534a720c0683405a8fe6e24b6313 100644 (file)
--- 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: