projects
/
awesomized
/
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
[awesomized/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index 3e8e3fcdea9b7600c551c5bdfca46a38ef60698f..fc7a37c693bafa2a1af53405d017a89b4c315a81 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-87,9
+87,7
@@
public:
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
- Wait wait(pid_file(), 0);
-
- if (error_is_ok and not wait.successful())
+ if (error_is_ok and not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
{
Error << "Pidfile was not found:" << pid_file();
return -1;
@@
-100,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
{
@@
-120,9
+123,7
@@
public:
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
- Wait wait(pid_file(), 0);
-
- if (not wait.successful())
+ if (not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
{
Error << "Pidfile was not found:" << pid_file();
return -1;
@@
-230,9
+231,7
@@
public:
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
- Wait wait(pid_file(), 0);
-
- if (error_is_ok and not wait.successful())
+ if (error_is_ok and not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
{
Error << "Pidfile was not found:" << pid_file();
return -1;
@@
-263,9
+262,7
@@
public:
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
- Wait wait(pid_file(), 0);
-
- if (not wait.successful())
+ if (not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
{
Error << "Pidfile was not found:" << pid_file();
return -1;
@@
-306,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 ";