projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge bzr://10.0.3.21 Build: jenkins-Libmemcached-469
[awesomized/libmemcached]
/
libtest
/
server.h
diff --git
a/libtest/server.h
b/libtest/server.h
index a41e621bb1f491cccf804d334493b360c53e4409..bbebe95714c2b000a9d2ee353175a8c9606cb57e 100644
(file)
--- a/
libtest/server.h
+++ b/
libtest/server.h
@@
-177,7
+177,8
@@
public:
virtual bool ping()= 0;
virtual bool ping()= 0;
- virtual bool build(size_t argc, const char *argv[])= 0;
+ bool init(const char *argv[]);
+ virtual bool build()= 0;
void add_option(const std::string&);
void add_option(const std::string&, const std::string&);
void add_option(const std::string&);
void add_option(const std::string&, const std::string&);
@@
-223,6
+224,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
@@
-232,7
+238,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
@@
-250,6
+256,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;
@@
-262,9
+283,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;
bool args(Application&);
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);