5 files changed, 30 insertions, 27 deletions
diff --git a/sca-cpp/trunk/components/cache/memcached-ssl-test b/sca-cpp/trunk/components/cache/memcached-ssl-test
index ffd1cd0e8e..6a9dc2cd27 100755
--- a/sca-cpp/trunk/components/cache/memcached-ssl-test
+++ b/sca-cpp/trunk/components/cache/memcached-ssl-test
@@ -22,9 +22,9 @@
 ../../modules/http/ssl-cert-conf tmp/ssl localhost server
 ../../modules/http/ssl-cert-conf tmp/ssl localhost tunnel
 
-./memcached-start 11411
-./memcached-start 11412
-./memcached-start 11413
+./memcached-start tmp 11411
+./memcached-start tmp 11412
+./memcached-start tmp 11413
 
 ../../modules/http/httpd-conf tmp/tunnel localhost 8089 htdocs
 ../../modules/http/httpd-event-conf tmp/tunnel
@@ -49,7 +49,7 @@ rc=$?
 # Cleanup
 ../../modules/http/httpd-stop tmp/tunnel
 ../../modules/http/httpd-stop tmp/server
-./memcached-stop 11411
-./memcached-stop 11412
-./memcached-stop 11413
+./memcached-stop tmp 11411
+./memcached-stop tmp 11412
+./memcached-stop tmp 11413
 exit $rc
diff --git a/sca-cpp/trunk/components/cache/memcached-start b/sca-cpp/trunk/components/cache/memcached-start
index a49ad2919a..947b583ec0 100755
--- a/sca-cpp/trunk/components/cache/memcached-start
+++ b/sca-cpp/trunk/components/cache/memcached-start
@@ -40,10 +40,12 @@ else
     log="cat >>$root/logs/memcached"
     v=""
 fi
+mkdir -p $root/memcached
+echo $log > $root/memcached/logger
 
 if [ "$ip" = "" ]; then
-    ($memcached_prefix/bin/memcached -d -m 4 -p $port $v 2>&1 | $log)&
+    ($memcached_prefix/bin/memcached -d -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)&
 else
-    ($memcached_prefix/bin/memcached -d -l $ip -m 4 -p $port $v 2>&1 | $log)&
+    ($memcached_prefix/bin/memcached -d -l $ip -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)&
 fi
 
diff --git a/sca-cpp/trunk/components/cache/memcached-stop b/sca-cpp/trunk/components/cache/memcached-stop
index b76fc28466..2b3b66c74d 100755
--- a/sca-cpp/trunk/components/cache/memcached-stop
+++ b/sca-cpp/trunk/components/cache/memcached-stop
@@ -19,8 +19,9 @@
 
 # Stop memcached
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
+root=`echo "import os; print os.path.realpath('$1')" | python`
 
-addr=$1
+addr=$2
 if [ "$addr" = "" ]; then
     ip=""
     port="11211"
diff --git a/sca-cpp/trunk/components/cache/memcached-test b/sca-cpp/trunk/components/cache/memcached-test
index 8e034bb936..e647c5525e 100755
--- a/sca-cpp/trunk/components/cache/memcached-test
+++ b/sca-cpp/trunk/components/cache/memcached-test
@@ -18,9 +18,9 @@
 #  under the License.
 
 # Setup
-./memcached-start 11211
-./memcached-start 11212
-./memcached-start 11213
+./memcached-start tmp 11211
+./memcached-start tmp 11212
+./memcached-start tmp 11213
 sleep 1
 
 # Test
@@ -28,7 +28,7 @@ sleep 1
 rc=$?
 
 # Cleanup
-./memcached-stop 11211
-./memcached-stop 11212
-./memcached-stop 11213
+./memcached-stop tmp 11211
+./memcached-stop tmp 11212
+./memcached-stop tmp 11213
 exit $rc
diff --git a/sca-cpp/trunk/components/cache/server-test b/sca-cpp/trunk/components/cache/server-test
index d9176f37ac..bc56b1fe19 100755
--- a/sca-cpp/trunk/components/cache/server-test
+++ b/sca-cpp/trunk/components/cache/server-test
@@ -27,12 +27,12 @@ SCAContribution `pwd`/
 SCAComposite cache.composite
 EOF
 
-./memcached-start 11211
-./memcached-start 11212
-./memcached-start 11213
-./memcached-start 11411
-./memcached-start 11412
-./memcached-start 11413
+./memcached-start tmp 11211
+./memcached-start tmp 11212
+./memcached-start tmp 11213
+./memcached-start tmp 11411
+./memcached-start tmp 11412
+./memcached-start tmp 11413
 ../../modules/http/httpd-start tmp
 sleep 2
 
@@ -42,11 +42,11 @@ rc=$?
 
 # Cleanup
 ../../modules/http/httpd-stop tmp
-./memcached-stop 11211
-./memcached-stop 11212
-./memcached-stop 11213
-./memcached-stop 11411
-./memcached-stop 11412
-./memcached-stop 11413
+./memcached-stop tmp 11211
+./memcached-stop tmp 11212
+./memcached-stop tmp 11213
+./memcached-stop tmp 11411
+./memcached-stop tmp 11412
+./memcached-stop tmp 11413
 sleep 2
 exit $rc