diff options
Diffstat (limited to 'sca-cpp/trunk/components/cache')
-rw-r--r-- | sca-cpp/trunk/components/cache/Makefile.am | 3 | ||||
-rw-r--r-- | sca-cpp/trunk/components/cache/datacache.cpp | 2 | ||||
-rw-r--r-- | sca-cpp/trunk/components/cache/memcache.cpp | 8 | ||||
-rw-r--r-- | sca-cpp/trunk/components/cache/memcache.hpp | 2 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/cache/memcached-ssl-test | 1 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/cache/memcached-stop | 6 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/cache/memcached-test | 1 | ||||
-rw-r--r-- | sca-cpp/trunk/components/cache/partitioner.cpp | 12 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/cache/server-test | 1 |
9 files changed, 22 insertions, 14 deletions
diff --git a/sca-cpp/trunk/components/cache/Makefile.am b/sca-cpp/trunk/components/cache/Makefile.am index 1f24d59c72..0240a32bb4 100644 --- a/sca-cpp/trunk/components/cache/Makefile.am +++ b/sca-cpp/trunk/components/cache/Makefile.am @@ -54,4 +54,5 @@ client_test_LDFLAGS = -lxml2 -lcurl -lmozjs dist_noinst_SCRIPTS = memcached-test memcached-ssl-test server-test noinst_PROGRAMS = memcache-test client-test -TESTS = memcached-test memcached-ssl-test server-test +#TESTS = memcached-test memcached-ssl-test server-test +TESTS = memcached-test server-test diff --git a/sca-cpp/trunk/components/cache/datacache.cpp b/sca-cpp/trunk/components/cache/datacache.cpp index f7e812dd18..c26e6eb868 100644 --- a/sca-cpp/trunk/components/cache/datacache.cpp +++ b/sca-cpp/trunk/components/cache/datacache.cpp @@ -56,7 +56,7 @@ const failable<value> get(const value& key, const lambda<value(const list<value> if (isNil(val2)) { ostringstream os; os << "Couldn't get cache entry: " << key; - return mkfailure<value>(str(os), false); + return mkfailure<value>(str(os), 404, false); } // Update level1 cache diff --git a/sca-cpp/trunk/components/cache/memcache.cpp b/sca-cpp/trunk/components/cache/memcache.cpp index 6347eb55de..af710696b3 100644 --- a/sca-cpp/trunk/components/cache/memcache.cpp +++ b/sca-cpp/trunk/components/cache/memcache.cpp @@ -48,7 +48,7 @@ const failable<value> post(const list<value>& params, memcache::MemCached& ch) { const value id = append<value>(car(params), mklist(mkuuid())); const failable<bool> val = memcache::post(id, cadr(params), ch); if (!hasContent(val)) - return mkfailure<value>(reason(val)); + return mkfailure<value>(val); return id; } @@ -58,7 +58,7 @@ const failable<value> post(const list<value>& params, memcache::MemCached& ch) { const failable<value> put(const list<value>& params, memcache::MemCached& ch) { const failable<bool> val = memcache::put(car(params), cadr(params), ch); if (!hasContent(val)) - return mkfailure<value>(reason(val)); + return mkfailure<value>(val); return value(content(val)); } @@ -68,7 +68,7 @@ const failable<value> put(const list<value>& params, memcache::MemCached& ch) { const failable<value> del(const list<value>& params, memcache::MemCached& ch) { const failable<bool> val = memcache::del(car(params), ch); if (!hasContent(val)) - return mkfailure<value>(reason(val)); + return mkfailure<value>(val); return value(content(val)); } @@ -90,7 +90,7 @@ public: return put(cdr(params), ch); if (func == "delete") return del(cdr(params), ch); - return tuscany::mkfailure<tuscany::value>(); + return mkfailure<value>(); } private: diff --git a/sca-cpp/trunk/components/cache/memcache.hpp b/sca-cpp/trunk/components/cache/memcache.hpp index 2dcd6ea033..fe77c26671 100644 --- a/sca-cpp/trunk/components/cache/memcache.hpp +++ b/sca-cpp/trunk/components/cache/memcache.hpp @@ -180,7 +180,7 @@ const failable<value> get(const value& key, const MemCached& cache) { if (rc != APR_SUCCESS) { ostringstream os; os << "Couldn't get memcached entry: " << key; - return mkfailure<value>(str(os), false); + return mkfailure<value>(str(os), 404, false); } const value val(scheme::readValue(string(data, size))); diff --git a/sca-cpp/trunk/components/cache/memcached-ssl-test b/sca-cpp/trunk/components/cache/memcached-ssl-test index 6a9dc2cd27..8ef37a0b98 100755 --- a/sca-cpp/trunk/components/cache/memcached-ssl-test +++ b/sca-cpp/trunk/components/cache/memcached-ssl-test @@ -18,6 +18,7 @@ # under the License. # Setup +rm -rf tmp ../../modules/http/ssl-ca-conf tmp/ssl localhost ../../modules/http/ssl-cert-conf tmp/ssl localhost server ../../modules/http/ssl-cert-conf tmp/ssl localhost tunnel diff --git a/sca-cpp/trunk/components/cache/memcached-stop b/sca-cpp/trunk/components/cache/memcached-stop index 2b3b66c74d..50d094b9c7 100755 --- a/sca-cpp/trunk/components/cache/memcached-stop +++ b/sca-cpp/trunk/components/cache/memcached-stop @@ -37,4 +37,8 @@ else mc="$memcached_prefix/bin/memcached -d -l $ip -m 4 -p $port" fi -kill `ps -ef | grep -v grep | grep "${mc}" | awk '{ print $2 }'` +k=`ps -ef | grep -v grep | grep "${mc}" | awk '{ print $2 }'` +if [ "$k" != "" ]; then + kill $k +fi + diff --git a/sca-cpp/trunk/components/cache/memcached-test b/sca-cpp/trunk/components/cache/memcached-test index e647c5525e..dc274bd4aa 100755 --- a/sca-cpp/trunk/components/cache/memcached-test +++ b/sca-cpp/trunk/components/cache/memcached-test @@ -18,6 +18,7 @@ # under the License. # Setup +rm -rf tmp ./memcached-start tmp 11211 ./memcached-start tmp 11212 ./memcached-start tmp 11213 diff --git a/sca-cpp/trunk/components/cache/partitioner.cpp b/sca-cpp/trunk/components/cache/partitioner.cpp index 609d42f494..ea12699977 100644 --- a/sca-cpp/trunk/components/cache/partitioner.cpp +++ b/sca-cpp/trunk/components/cache/partitioner.cpp @@ -47,7 +47,7 @@ const failable<lambda<value(const list<value>&)> > partition(const value& key, c if (isNil(p)) { ostringstream os; os << "Couldn't get partition number: " << key; - return mkfailure<lambda<value(const list<value>&)> >(str(os), false); + return mkfailure<lambda<value(const list<value>&)> >(str(os), -1, false); } return (const lambda<value(const list<value>&)>)p; } @@ -60,14 +60,14 @@ const failable<value> get(const value& key, const lambda<value(const list<value> // Select partition const failable<lambda<value(const list<value>&)> > p = partition(key, selector, partitions); if (!hasContent(p)) - return mkfailure<value>(reason(p)); + return mkfailure<value>(p); // Get from selected partition const value val = content(p)(mklist<value>("get", key)); if (isNil(val)) { ostringstream os; os << "Couldn't get entry from partition: " << key; - return mkfailure<value>(str(os), false); + return mkfailure<value>(str(os), 404, false); } return val; @@ -82,7 +82,7 @@ const failable<value> post(const value& key, const value& val, const lambda<valu // Select partition const failable<lambda<value(const list<value>&)> > p = partition(id, selector, partitions); if (!hasContent(p)) - return mkfailure<value>(reason(p)); + return mkfailure<value>(p); // Put into select partition content(p)(mklist<value>("put", id, val)); @@ -98,7 +98,7 @@ const failable<value> put(const value& key, const value& val, const lambda<value // Select partition const failable<lambda<value(const list<value>&)> > p = partition(key, selector, partitions); if (!hasContent(p)) - return mkfailure<value>(reason(p)); + return mkfailure<value>(p); // Put into selected partition content(p)(mklist<value>("put", key, val)); @@ -114,7 +114,7 @@ const failable<value> del(const value& key, const lambda<value(const list<value> // Select partition const failable<lambda<value(const list<value>&)> > p = partition(key, selector, partitions); if (!hasContent(p)) - return mkfailure<value>(reason(p)); + return mkfailure<value>(p); // Delete from selected partition content(p)(mklist<value>("delete", key)); diff --git a/sca-cpp/trunk/components/cache/server-test b/sca-cpp/trunk/components/cache/server-test index bc56b1fe19..951159c4c8 100755 --- a/sca-cpp/trunk/components/cache/server-test +++ b/sca-cpp/trunk/components/cache/server-test @@ -18,6 +18,7 @@ # under the License. # Setup +rm -rf tmp ../../modules/http/httpd-conf tmp localhost 8090 ../../modules/http/htdocs ../../modules/http/httpd-event-conf tmp ../../modules/server/server-conf tmp |