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
/
gearmand.cc
diff --git
a/libtest/gearmand.cc
b/libtest/gearmand.cc
index deac09f3562cd2754b63e049fb9ff4d93cce56f8..4a544f10b9671eeb35b5263e2ee4b069c40e440b 100644
(file)
--- a/
libtest/gearmand.cc
+++ b/
libtest/gearmand.cc
@@
-96,7
+96,7
@@
public:
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() == false
)
{
Wait wait(pid_file(), 0);
{
Wait wait(pid_file(), 0);
@@
-124,12
+124,12
@@
public:
bool ping()
{
gearman_client_st *client= gearman_client_create(NULL);
bool ping()
{
gearman_client_st *client= gearman_client_create(NULL);
- if (
not client
)
+ if (
client == NULL
)
{
Error << "Could not allocate memory for gearman_client_create()";
return false;
}
{
Error << "Could not allocate memory for gearman_client_create()";
return false;
}
- gearman_client_set_timeout(client,
1
000);
+ gearman_client_set_timeout(client,
3
000);
if (gearman_success(gearman_client_add_server(client, hostname().c_str(), port())))
{
if (gearman_success(gearman_client_add_server(client, hostname().c_str(), port())))
{
@@
-140,6
+140,13
@@
public:
gearman_client_free(client);
return true;
}
gearman_client_free(client);
return true;
}
+#if 0
+ Error << hostname().c_str() << ":" << port() << " was " << gearman_strerror(rc) << " extended: " << gearman_client_error(client);
+#endif
+ }
+ else
+ {
+ Error << "gearman_client_add_server() " << gearman_client_error(client);
}
gearman_client_free(client);
}
gearman_client_free(client);
@@
-157,24
+164,25
@@
public:
return GEARMAND_BINARY;
}
return GEARMAND_BINARY;
}
- const char *pid_file_option()
- {
- return "--pid-file=";
- }
-
const char *daemon_file_option()
{
return "--daemon";
}
const char *daemon_file_option()
{
return "--daemon";
}
-
const char *log_file_option(
)
+
void log_file_option(Application& app, const std::string& arg
)
{
{
- return "-vvvvv --log-file=";
+ if (arg.empty() == false)
+ {
+ std::string buffer("--log-file=");
+ buffer+= arg;
+ app.add_option("--verbose=DEBUG");
+ app.add_option(buffer);
+ }
}
}
- const char *port_option()
+ bool has_log_file_option() const
{
{
- return
"--port="
;
+ return
true
;
}
bool is_libtool()
}
bool is_libtool()
@@
-182,27
+190,35
@@
public:
return true;
}
return true;
}
- bool build(int argc, const char *argv[]);
+ bool has_syslog() const
+ {
+ return true;
+ }
+
+ bool has_port_option() const
+ {
+ return true;
+ }
+
+ bool build(size_t argc, const char *argv[]);
};
};
-bool Gearmand::build(
in
t argc, const char *argv[])
+bool Gearmand::build(
size_
t argc, const char *argv[])
{
std::stringstream arg_buffer;
if (getuid() == 0 or geteuid() == 0)
{
{
std::stringstream arg_buffer;
if (getuid() == 0 or geteuid() == 0)
{
- a
rg_buffer << " -u root "
;
+ a
dd_option("-u", "root")
;
}
}
- a
rg_buffer << " --listen=127.0.0.1 "
;
+ a
dd_option("--listen=localhost")
;
- for (
int x= 1
; x < argc ; x++)
+ for (
size_t x= 0
; x < argc ; x++)
{
{
- a
rg_buffer << " " << argv[x] << " "
;
+ a
dd_option(argv[x])
;
}
}
- set_extra_args(arg_buffer.str());
-
return true;
}
return true;
}