projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-170
[m6w6/libmemcached]
/
libtest
/
server_container.cc
diff --git
a/libtest/server_container.cc
b/libtest/server_container.cc
index 05997238bb2379624f048217d9d4b488639f22f1..17dd6d445f849cc834f82e8c2c2292bf218488e7 100644
(file)
--- a/
libtest/server_container.cc
+++ b/
libtest/server_container.cc
@@
-34,8
+34,9
@@
*
*/
*
*/
-#include "mem_config.h"
-#include <libtest/common.h>
+#include "libtest/yatlcon.h"
+
+#include "libtest/common.h"
#include <cassert>
#include <cerrno>
#include <cassert>
#include <cerrno>
@@
-75,13
+76,14
@@
void server_startup_st::push_server(Server *arg)
}
else
{
}
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+= "--server=";
server_config_string+= arg->hostname();
server_config_string+= ":";
- server_config_string+=
port_str
;
+ server_config_string+=
&port_str[0]
;
server_config_string+= " ";
}
server_config_string+= " ";
}
@@
-239,16
+241,6
@@
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_BINARY)
- {
- if (HAVE_LIBMEMCACHED)
- {
- server= build_memcached_sasl("localhost", try_port, username(), password());
- }
- }
- }
else if (server_type.compare("memcached") == 0)
{
if (HAVE_MEMCACHED_BINARY)
else if (server_type.compare("memcached") == 0)
{
if (HAVE_MEMCACHED_BINARY)
@@
-302,9
+294,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
}
}
}
}
}
}
@@
-405,9
+402,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
}
}
}
}
}
}