projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
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 5e081f62776c1627c44f008f95ba15ee5ac7506d..e9b2f4e094b5572a47308535873bd9d558b335d5 100644
(file)
--- a/
libtest/server_container.cc
+++ b/
libtest/server_container.cc
@@
-202,20
+202,14
@@
bool server_startup_st::start_server(const std::string& server_type, in_port_t t
{
if (GEARMAND_BINARY)
{
{
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)
{
}
}
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)
}
}
else if (server_type.compare("drizzled") == 0)
@@
-245,10
+239,7
@@
bool server_startup_st::start_server(const std::string& server_type, in_port_t t
{
if (HAVE_MEMCACHED_BINARY)
{
{
if (HAVE_MEMCACHED_BINARY)
{
- if (HAVE_LIBMEMCACHED)
- {
- server= build_memcached("localhost", try_port);
- }
+ server= build_memcached("localhost", try_port);
}
}
}
}
@@
-294,9
+285,14
@@
bool server_startup_st::start_server(const std::string& server_type, in_port_t t
{
if (opt_startup_message)
{
{
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
}
}
}
}
}
}
@@
-337,16
+333,9
@@
bool server_startup_st::start_socket_server(const std::string& server_type, cons
}
else if (server_type.compare("memcached") == 0)
{
}
else if (server_type.compare("memcached") == 0)
{
- if (MEMCACHED_BINARY)
+ if (
HAVE_
MEMCACHED_BINARY)
{
{
- if (HAVE_LIBMEMCACHED)
- {
server= build_memcached_socket("localhost", try_port);
server= build_memcached_socket("localhost", try_port);
- }
- else
- {
- Error << "Libmemcached was not found";
- }
}
else
{
}
else
{
@@
-397,9
+386,14
@@
bool server_startup_st::start_socket_server(const std::string& server_type, cons
{
if (opt_startup_message)
{
{
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
}
}
}
}
}
}