projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update of libtest
[awesomized/libmemcached]
/
libtest
/
server_container.cc
diff --git
a/libtest/server_container.cc
b/libtest/server_container.cc
index 244f80e6b4fb7545642132bd36cda7653977a587..ff44228ab4c8c85c6d05211640437626c5907bec 100644
(file)
--- a/
libtest/server_container.cc
+++ b/
libtest/server_container.cc
@@
-19,6
+19,7
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <config.h>
#include <libtest/common.h>
#include <cassert>
#include <libtest/common.h>
#include <cassert>
@@
-195,11
+196,20
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
}
}
}
}
}
}
+ 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)
{
if (server == NULL)
{
- Error << "Failure occured while creating server: " << server_type;
- return false;
+ fatal_message("Launching of an unknown server was attempted");
}
/*
}
/*
@@
-226,7
+236,6
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
}
else if (server->start() == false)
{
}
else if (server->start() == false)
{
- Error << "Failed to start " << *server;
delete server;
return false;
}
delete server;
return false;
}