{
for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); ++iter)
{
- (*iter)->start();
+ Server *server = *iter;
+
+ if (server->check()) {
+ server->kill();
+ }
+ server->start();
}
}
}
else if (server_type.compare("drizzled") == 0)
{
- if (DRIZZLED_BINARY)
+ if (has_drizzled())
{
- if (HAVE_LIBDRIZZLE)
+ if (has_libdrizzle())
{
server= build_drizzled("localhost", try_port);
}
}
else if (server_type.compare("blobslap_worker") == 0)
{
- if (GEARMAND_BINARY)
+ if (has_gearmand())
{
+#ifdef GEARMAND_BLOBSLAP_WORKER
if (GEARMAND_BLOBSLAP_WORKER)
{
if (HAVE_LIBGEARMAN)
server= build_blobslap_worker(try_port);
}
}
+#endif // GEARMAND_BLOBSLAP_WORKER
}
}
else if (server_type.compare("memcached") == 0)
{
- if (HAVE_MEMCACHED_BINARY)
+ if (has_memcached())
{
server= build_memcached("localhost", try_port);
}
else
{
{
-#if defined(DEBUG)
+#ifdef DEBUG
if (DEBUG)
{
Outn();