projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in build trunk
[m6w6/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index daf6787cf69b9c86bd2afaaefe2b58772c2b47d8..fc7a37c693bafa2a1af53405d017a89b4c315a81 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-98,7
+98,12
@@
public:
memcached_return_t rc= MEMCACHED_SUCCESS;
if (has_socket())
{
memcached_return_t rc= MEMCACHED_SUCCESS;
if (has_socket())
{
- local_pid= libmemcached_util_getpid(socket().c_str(), 0, &rc);
+ if (socket().empty())
+ {
+ return -1;
+ }
+
+ local_pid= libmemcached_util_getpid(socket().c_str(), port(), &rc);
}
else
{
}
else
{
@@
-298,7
+303,7
@@
bool Memcached::build(int argc, const char *argv[])
arg_buffer << " -u root ";
}
arg_buffer << " -u root ";
}
- arg_buffer << " -l
127.0.0.1
";
+ arg_buffer << " -l
localhost
";
arg_buffer << " -m 128 ";
arg_buffer << " -M ";
arg_buffer << " -m 128 ";
arg_buffer << " -M ";