projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-170
[m6w6/libmemcached]
/
libtest
/
server.h
diff --git
a/libtest/server.h
b/libtest/server.h
index 736810be0ae94b895ecf2523d479fa0bd54c1869..f51388089747dc36d88356450969e7507f84536e 100644
(file)
--- a/
libtest/server.h
+++ b/
libtest/server.h
@@
-204,8
+204,6
@@
public:
_log_file.clear();
}
_log_file.clear();
}
- bool args(Application&);
-
pid_t pid() const;
bool has_pid() const;
pid_t pid() const;
bool has_pid() const;
@@
-225,6
+223,11
@@
public:
_error= arg;
}
_error= arg;
}
+ void reset_error()
+ {
+ _error.clear();
+ }
+
virtual bool wait_for_pidfile() const;
bool check_pid(pid_t pid_arg) const
virtual bool wait_for_pidfile() const;
bool check_pid(pid_t pid_arg) const
@@
-234,7
+237,7
@@
public:
bool is_socket() const
{
bool is_socket() const
{
- return _
hostname[0] == '/'
;
+ return _
is_socket
;
}
const std::string running() const
}
const std::string running() const
@@
-252,6
+255,21
@@
public:
bool validate();
bool validate();
+ void out_of_ban_killed(bool arg)
+ {
+ out_of_ban_killed_= arg;
+ }
+
+ bool out_of_ban_killed()
+ {
+ return out_of_ban_killed_;
+ }
+
+ void timeout(uint32_t timeout_)
+ {
+ _timeout= timeout_;
+ }
+
protected:
bool set_pid_file();
Options _options;
protected:
bool set_pid_file();
Options _options;
@@
-264,7
+282,11
@@
private:
bool set_log_file();
bool set_socket_file();
void reset_pid();
bool set_log_file();
bool set_socket_file();
void reset_pid();
+ bool out_of_ban_killed_;
+ bool args(Application&);
+
std::string _error;
std::string _error;
+ uint32_t _timeout; // This number should be high enough for valgrind startup (which is slow)
};
std::ostream& operator<<(std::ostream& output, const libtest::Server &arg);
};
std::ostream& operator<<(std::ostream& output, const libtest::Server &arg);