Second pass on update of yatl.

[awesomized/libmemcached] / libtest / server_container.cc

diff --git a/libtest/server_container.cc b/libtest/server_container.cc
index 0448e20900e2b847831a6f5c802a073e68eb9135..e9b2f4e094b5572a47308535873bd9d558b335d5 100644 (file)
--- a/libtest/server_container.cc
+++ b/libtest/server_container.cc
@@ -34,8 +34,9 @@
  *
  */
 
-#include <config.h>
-#include <libtest/common.h>
+#include "libtest/yatlcon.h"
+
+#include "libtest/common.h"
 
 #include <cassert>
 #include <cerrno>
@@ -75,13 +76,14 @@ void server_startup_st::push_server(Server *arg)
   }
   else
   {
-    char port_str[NI_MAXSERV]= { 0 };
-    snprintf(port_str, sizeof(port_str), "%u", int(arg->port()));
+    libtest::vchar_t port_str;
+    port_str.resize(NI_MAXSERV);
+    snprintf(&port_str[0], port_str.size(), "%u", int(arg->port()));
 
     server_config_string+= "--server=";
     server_config_string+= arg->hostname();
     server_config_string+= ":";
-    server_config_string+= port_str;
+    server_config_string+= &port_str[0];
     server_config_string+= " ";
   }
 
@@ -182,7 +184,7 @@ bool server_startup_st::validate()
 
 bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message)
 {
-  construct.start_server(server_type, try_port, argc, argv, opt_startup_message);
+  return construct.start_server(server_type, try_port, argc, argv, opt_startup_message);
 }
 
 bool server_startup_st::start_server(const std::string& server_type, in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message)
@@ -200,20 +202,14 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t
     {
       if (GEARMAND_BINARY)
       {
-        if (HAVE_LIBGEARMAN)
-        {
-          server= build_gearmand("localhost", try_port);
-        }
+        server= build_gearmand("localhost", try_port);
       }
     }
     else if (server_type.compare("hostile-gearmand") == 0)
     {
       if (GEARMAND_BINARY)
       {
-        if (HAVE_LIBGEARMAN)
-        {
-          server= build_gearmand("localhost", try_port, "gearmand/hostile_gearmand");
-        }
+        server= build_gearmand("localhost", try_port, "gearmand/hostile_gearmand");
       }
     }
     else if (server_type.compare("drizzled") == 0)
@@ -239,34 +235,11 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t
         }
       }
     }
-    else if (server_type.compare("memcached-sasl") == 0)
-    {
-      if (MEMCACHED_SASL_BINARY)
-      {
-        if (HAVE_LIBMEMCACHED)
-        {
-          server= build_memcached_sasl("localhost", try_port, username(), password());
-        }
-      }
-    }
     else if (server_type.compare("memcached") == 0)
     {
       if (HAVE_MEMCACHED_BINARY)
       {
-        if (HAVE_LIBMEMCACHED)
-        {
-          server= build_memcached("localhost", try_port);
-        }
-      }
-    }
-    else if (server_type.compare("memcached-light") == 0)
-    {
-      if (MEMCACHED_LIGHT_BINARY)
-      {
-        if (HAVE_LIBMEMCACHED)
-        {
-          server= build_memcached_light("localhost", try_port);
-        }
+        server= build_memcached("localhost", try_port);
       }
     }
 
@@ -274,7 +247,13 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t
     {
       throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Launching of an unknown server was attempted: %s", server_type.c_str());
     }
+  }
+  catch (...)
+  {
+    throw;
+  }
 
+  try {
     /*
       We will now cycle the server we have created.
     */
@@ -296,20 +275,35 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t
     }
     else
 #endif
+
       if (server->start() == false)
+      {
+        delete server;
+        return false;
+      }
+      else
+      {
+        if (opt_startup_message)
+        {
+#if defined(DEBUG)
+          if (DEBUG)
+          {
+            Outn();
+            Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+            Outn();
+          }
+#endif
+        }
+      }
+  }
+  catch (libtest::disconnected& err)
+  {
+    if (fatal::is_disabled() == false and try_port != LIBTEST_FAIL_PORT)
     {
+      stream::cerr(err.file(), err.line(), err.func()) << err.what();
       delete server;
       return false;
     }
-    else
-    {
-      if (opt_startup_message)
-      {
-        Outn();
-        Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
-        Outn();
-      }
-    }
   }
   catch (...)
   {
@@ -337,36 +331,11 @@ bool server_startup_st::start_socket_server(const std::string& server_type, cons
     {
       Error << "Socket files are not supported for gearmand yet";
     }
-    else if (server_type.compare("memcached-sasl") == 0)
-    {
-      if (MEMCACHED_SASL_BINARY)
-      {
-        if (HAVE_LIBMEMCACHED)
-        {
-          server= build_memcached_sasl_socket("localhost", try_port, username(), password());
-        }
-        else
-        {
-          Error << "Libmemcached was not found";
-        }
-      }
-      else
-      {
-        Error << "No memcached binary is available";
-      }
-    }
     else if (server_type.compare("memcached") == 0)
     {
-      if (MEMCACHED_BINARY)
+      if (HAVE_MEMCACHED_BINARY)
       {
-        if (HAVE_LIBMEMCACHED)
-        {
           server= build_memcached_socket("localhost", try_port);
-        }
-        else
-        {
-          Error << "Libmemcached was not found";
-        }
       }
       else
       {
@@ -417,9 +386,14 @@ bool server_startup_st::start_socket_server(const std::string& server_type, cons
     {
       if (opt_startup_message)
       {
-        Outn();
-        Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
-        Outn();
+#if defined(DEBUG)
+        if (DEBUG)
+        {
+          Outn();
+          Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+          Outn();
+        }
+#endif
       }
     }
   }