Merge lp://staging/~posulliv/libmemcached/cpp-interface into lp://staging/~tangent-org/libmemcached/trunk

Proposed by Padraig O'Sullivan
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~posulliv/libmemcached/cpp-interface
Merge into: lp://staging/~tangent-org/libmemcached/trunk
Diff against target: 48 lines
1 file modified
libmemcached/memcached.hpp (+24/-1)
To merge this branch: bzr merge lp://staging/~posulliv/libmemcached/cpp-interface
Reviewer Review Type Date Requested Status
Libmemcached-developers Pending
Review via email: mp+12960@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Padraig O'Sullivan (posulliv) wrote :

Contains some small updates to the C++ interface. Added a method for removing a server from the list of memcached servers to the C++ api.

-Padraig

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libmemcached/memcached.hpp'
2--- libmemcached/memcached.hpp 2009-09-19 23:36:57 +0000
3+++ libmemcached/memcached.hpp 2009-10-07 01:35:18 +0000
4@@ -164,6 +164,7 @@
5 {
6 servers_list.assign(in_servers_list);
7 servers= memcached_servers_parse(in_servers_list.c_str());
8+ memcached_server_push(&memc, servers);
9 return (servers == NULL);
10 }
11
12@@ -171,7 +172,7 @@
13 * Add a server to the list of memcached servers to use.
14 *
15 * @param[in] server_name name of the server to add
16- * @param[in[ port port number of server to add
17+ * @param[in] port port number of server to add
18 * @return true on success; false otherwise
19 */
20 bool addServer(const std::string &server_name, unsigned int port)
21@@ -187,6 +188,28 @@
22 server_name.c_str(),
23 port,
24 &rc);
25+ memcached_server_push(&memc, servers);
26+ return (rc == MEMCACHED_SUCCESS);
27+ }
28+
29+ /**
30+ * Remove a server from the list of memcached servers to use.
31+ *
32+ * @param[in] server_name name of the server to remove
33+ * @param[in] port port number of server to remove
34+ * @return true on success; false otherwise
35+ */
36+ bool removeServer(const std::string &server_name, size_t port)
37+ {
38+ std::string tmp_str;
39+ std::ostringstream strstm;
40+ tmp_str.append(",");
41+ tmp_str.append(server_name);
42+ tmp_str.append(":");
43+ strstm << port;
44+ tmp_str.append(strstm.str());
45+ memcached_server_st *server= memcached_servers_parse(tmp_str.c_str());
46+ memcached_return rc= memcached_server_remove(server);
47 return (rc == MEMCACHED_SUCCESS);
48 }
49

Subscribers

People subscribed via source and target branches