X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver_container.cc;h=05997238bb2379624f048217d9d4b488639f22f1;hb=6b83fd5838692b71a50710b9bc13680f9c586167;hp=2d7655bcffbdba6f717f140b62c7f31a03551793;hpb=fed85d3c429c3881cd378d10e4dccd30f4fd2478;p=m6w6%2Flibmemcached

diff --git a/libtest/server_container.cc b/libtest/server_container.cc
index 2d7655bc..05997238 100644
--- a/libtest/server_container.cc
+++ b/libtest/server_container.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <cassert>
@@ -241,7 +241,7 @@ 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 (MEMCACHED_BINARY)
       {
         if (HAVE_LIBMEMCACHED)
         {
@@ -259,22 +259,18 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t
         }
       }
     }
-    else if (server_type.compare("memcached-light") == 0)
-    {
-      if (MEMCACHED_LIGHT_BINARY)
-      {
-        if (HAVE_LIBMEMCACHED)
-        {
-          server= build_memcached_light("localhost", try_port);
-        }
-      }
-    }
 
     if (server == NULL)
     {
       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,32 +292,30 @@ 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)
       {
-        Outn();
-        Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
-        Outn();
+        delete server;
+        return false;
+      }
+      else
+      {
+        if (opt_startup_message)
+        {
+          Outn();
+          Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+          Outn();
+        }
       }
-    }
-  }
-  catch (libtest::start err)
-  {
-    stream::cerr(err.file(), err.line(), err.func()) << err.what();
-    delete server;
-    return false;
   }
-  catch (libtest::disconnected err)
+  catch (libtest::disconnected& err)
   {
-    stream::cerr(err.file(), err.line(), err.func()) << err.what();
-    delete server;
-    return false;
+    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;
+    }
   }
   catch (...)
   {
@@ -349,24 +343,6 @@ 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)