projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update man pages.
[awesomized/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index e3d90947a2c0e1b99a5395dbb94f0942d27122f4..3b63c0fc485e08f63c077879ff844e0ae203dae8 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-77,29
+77,30
@@
public:
{
Wait wait(pid_file(), 0);
{
Wait wait(pid_file(), 0);
- if (not wait.successful())
+ if (
error_is_ok and
not wait.successful())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
}
}
{
Error << "Pidfile was not found:" << pid_file();
return -1;
}
}
+ pid_t local_pid;
memcached_return_t rc;
if (has_socket())
{
memcached_return_t rc;
if (has_socket())
{
- _pid= libmemcached_util_getpid(socket().c_str(), port(), &rc);
+
local
_pid= libmemcached_util_getpid(socket().c_str(), port(), &rc);
}
else
{
}
else
{
- _pid= libmemcached_util_getpid(hostname().c_str(), port(), &rc);
+
local
_pid= libmemcached_util_getpid(hostname().c_str(), port(), &rc);
}
}
- if (
(memcached_failed(rc) or _pid < 1) and not error_is_ok
)
+ if (
error_is_ok and ((memcached_failed(rc) or local_pid < 1))
)
{
{
- Error << "libmemcached_util_getpid(" << memcached_strerror(NULL, rc) << ") pid: " << _pid << " for:" << *this;
+ Error << "libmemcached_util_getpid(" << memcached_strerror(NULL, rc) << ") pid: " <<
local
_pid << " for:" << *this;
}
}
- return _pid;
+ return
local
_pid;
}
bool ping()
}
bool ping()