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
=== modified file 'libmemcached/memcached.hpp'
--- libmemcached/memcached.hpp 2009-09-19 23:36:57 +0000
+++ libmemcached/memcached.hpp 2009-10-07 01:35:18 +0000
@@ -164,6 +164,7 @@
164 {164 {
165 servers_list.assign(in_servers_list);165 servers_list.assign(in_servers_list);
166 servers= memcached_servers_parse(in_servers_list.c_str());166 servers= memcached_servers_parse(in_servers_list.c_str());
167 memcached_server_push(&memc, servers);
167 return (servers == NULL);168 return (servers == NULL);
168 }169 }
169170
@@ -171,7 +172,7 @@
171 * Add a server to the list of memcached servers to use.172 * Add a server to the list of memcached servers to use.
172 *173 *
173 * @param[in] server_name name of the server to add174 * @param[in] server_name name of the server to add
174 * @param[in[ port port number of server to add175 * @param[in] port port number of server to add
175 * @return true on success; false otherwise176 * @return true on success; false otherwise
176 */177 */
177 bool addServer(const std::string &server_name, unsigned int port)178 bool addServer(const std::string &server_name, unsigned int port)
@@ -187,6 +188,28 @@
187 server_name.c_str(),188 server_name.c_str(),
188 port,189 port,
189 &rc);190 &rc);
191 memcached_server_push(&memc, servers);
192 return (rc == MEMCACHED_SUCCESS);
193 }
194
195 /**
196 * Remove a server from the list of memcached servers to use.
197 *
198 * @param[in] server_name name of the server to remove
199 * @param[in] port port number of server to remove
200 * @return true on success; false otherwise
201 */
202 bool removeServer(const std::string &server_name, size_t port)
203 {
204 std::string tmp_str;
205 std::ostringstream strstm;
206 tmp_str.append(",");
207 tmp_str.append(server_name);
208 tmp_str.append(":");
209 strstm << port;
210 tmp_str.append(strstm.str());
211 memcached_server_st *server= memcached_servers_parse(tmp_str.c_str());
212 memcached_return rc= memcached_server_remove(server);
190 return (rc == MEMCACHED_SUCCESS);213 return (rc == MEMCACHED_SUCCESS);
191 }214 }
192215

Subscribers

People subscribed via source and target branches