projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Issues fixed for Clang
[awesomized/libmemcached]
/
libtest
/
blobslap_worker.cc
diff --git
a/libtest/blobslap_worker.cc
b/libtest/blobslap_worker.cc
index a12df583e7f9db599ac403a2f6b8b006806e5ee0..7c7975eda59411d6b55d39b49754f927eb63c8eb 100644
(file)
--- a/
libtest/blobslap_worker.cc
+++ b/
libtest/blobslap_worker.cc
@@
-23,9
+23,6
@@
#include <libtest/common.h>
#include <libtest/blobslap_worker.h>
#include <libtest/common.h>
#include <libtest/blobslap_worker.h>
-#include <libtest/killpid.h>
-
-using namespace libtest;
#include <cassert>
#include <cerrno>
#include <cassert>
#include <cerrno>
@@
-44,7
+41,7
@@
using namespace libtest;
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
-using namespace libtest;
+namespace libtest {
class BlobslapWorker : public Server
{
class BlobslapWorker : public Server
{
@@
-52,24
+49,35
@@
private:
public:
BlobslapWorker(in_port_t port_arg) :
Server("localhost", port_arg)
public:
BlobslapWorker(in_port_t port_arg) :
Server("localhost", port_arg)
- { }
+ {
+ set_pid_file();
+ }
pid_t get_pid(bool error_is_ok)
{
pid_t get_pid(bool error_is_ok)
{
- if (
not
pid_file().empty())
+ if (pid_file().empty())
{
{
- Wait wait(pid_file(), 0);
+ Error << "pid_file was empty";
+ return -1;
+ }
- if (error_is_ok and not wait.successful())
- {
- Error << "Pidfile was not found:" << pid_file();
- return -1;
+ Wait wait(pid_file(), 0);
- return get_pid_from_file(pid_file());
- }
+ if (error_is_ok and not wait.successful())
+ {
+ Error << "Pidfile was not found:" << pid_file();
+ return -1;
}
}
- return -1;
+ std::stringstream error_message;
+ pid_t ret= get_pid_from_file(pid_file(), error_message);
+
+ if (error_is_ok and is_pid_valid(ret) == false)
+ {
+ Error << error_message.str();
+ }
+
+ return ret;
}
bool ping()
}
bool ping()
@@
-87,12
+95,15
@@
public:
return false;
}
return false;
}
- pid_t local_pid= get_pid_from_file(pid_file());
- if (local_pid <= 0)
+ std::stringstream error_message;
+ pid_t local_pid= get_pid_from_file(pid_file(), error_message);
+ if (is_pid_valid(local_pid) == false)
{
{
+ Error << error_message.str();
return false;
}
return false;
}
+ // Use kill to determine is the process exist
if (::kill(local_pid, 0) == 0)
{
return true;
if (::kill(local_pid, 0) == 0)
{
return true;
@@
-123,7
+134,7
@@
public:
const char *log_file_option()
{
const char *log_file_option()
{
- return
NULL
;
+ return
"--log-file="
;
}
const char *port_option()
}
const char *port_option()
@@
-156,11
+167,9
@@
bool BlobslapWorker::build(int argc, const char *argv[])
return true;
}
return true;
}
-namespace libtest {
-
Server *build_blobslap_worker(in_port_t try_port)
{
return new BlobslapWorker(try_port);
}
Server *build_blobslap_worker(in_port_t try_port)
{
return new BlobslapWorker(try_port);
}
-}
+}
// namespace libtest