X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libtest%2Fserver_container.h;h=b8743033ed85bd98fc29468d20a36249caa24de5;hb=8cf5f36e16ecaf6e1e7622a3a7cad81491602b0d;hp=0a78c4f5345e94d2b6274ea4028097ce0a9d4ffd;hpb=a1f2b0b98e03369ed051b232f1fc33ed1d611b16;p=awesomized%2Flibmemcached

diff --git a/libtest/server_container.h b/libtest/server_container.h
index 0a78c4f5..b8743033 100644
--- a/libtest/server_container.h
+++ b/libtest/server_container.h
@@ -68,11 +68,12 @@ public:
 
   bool validate();
 
-  bool start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[]);
+  bool start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message= true);
+  bool start_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message= true);
 
   uint32_t count() const
   {
-    return servers.size();
+    return uint32_t(servers.size());
   }
 
   void restart();
@@ -112,13 +113,16 @@ public:
   }
 
 
-  void shutdown_and_remove();
+  // Just remove everything after shutdown
+  void clear();
+
   bool shutdown();
   bool shutdown(uint32_t number_of_host);
 
   bool check() const;
 
   void push_server(Server *);
+  Server* last();
   Server *pop_server();
 
   unsigned long int servers_to_run() const