projects
/
awesomized
/
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-188
[awesomized/libmemcached]
/
libtest
/
server_container.h
diff --git
a/libtest/server_container.h
b/libtest/server_container.h
index b358e28dd93bbff7ce9cd40d47da10c42de9ac73..9e08336594072b2c5b07ad65d6fe227fbe69f08e 100644
(file)
--- a/
libtest/server_container.h
+++ b/
libtest/server_container.h
@@
-54,7
+54,6
@@
private:
std::string server_list;
bool _socket;
bool _sasl;
std::string server_list;
bool _socket;
bool _sasl;
- uint32_t _count;
std::string _username;
std::string _password;
std::string _username;
std::string _password;
@@
-68,11
+67,12
@@
public:
bool validate();
bool validate();
- bool start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[]);
+ bool start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message= true);
+ bool start_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message= true);
uint32_t count() const
{
uint32_t count() const
{
- return
servers.size(
);
+ return
uint32_t(servers.size()
);
}
void restart();
}
void restart();
@@
-121,8
+121,11
@@
public:
bool check() const;
void push_server(Server *);
bool check() const;
void push_server(Server *);
+ Server* last();
Server *pop_server();
Server *pop_server();
+ Server* create(const std::string& server_type, in_port_t try_port, const bool is_socket);
+
unsigned long int servers_to_run() const
{
return _servers_to_run;
unsigned long int servers_to_run() const
{
return _servers_to_run;
@@
-133,6
+136,13
@@
public:
_servers_to_run= arg;
}
_servers_to_run= arg;
}
+private:
+ bool _start_server(const bool is_socket,
+ const std::string& server_type,
+ const in_port_t try_port,
+ int argc, const char *argv[],
+ const bool opt_startup_message);
+
private:
unsigned long int _servers_to_run;
};
private:
unsigned long int _servers_to_run;
};