diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-01-16 03:49:01 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-01-16 03:49:01 +0000 |
commit | c3cc3ea6b1ea3472899bd467230fffd82d1889aa (patch) | |
tree | 8e4044bbed67b1dd9f33c1afe1bf47ef83664e9a /sca-cpp/trunk/components | |
parent | a38d708407bab7f1520f7c9e21d36246681f061f (diff) |
Fix error with logging command in memcached and sqldb start / stop scripts. Adjust test scripts, add new parameter required by memcached start / stop scripts.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1231821 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rwxr-xr-x | sca-cpp/trunk/components/cache/memcached-ssl-test | 12 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/cache/memcached-start | 6 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/cache/memcached-stop | 3 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/cache/memcached-test | 12 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/cache/server-test | 24 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/sqldb/pgsql-backup | 6 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/sqldb/pgsql-conf | 10 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/sqldb/pgsql-standby-conf | 4 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/sqldb/pgsql-start | 4 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/sqldb/pgsql-stop | 4 |
10 files changed, 49 insertions, 36 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 diff --git a/sca-cpp/trunk/components/sqldb/pgsql-backup b/sca-cpp/trunk/components/sqldb/pgsql-backup index 3c0be60e77..c0b1c4b2aa 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-backup +++ b/sca-cpp/trunk/components/sqldb/pgsql-backup @@ -37,13 +37,15 @@ else mkdir -p $root/logs pgsql_log="cat >>$root/logs/postgresql" fi +mkdir -p $root/sqldb +echo $pgsql_log >$root/sqldb/logger -$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_start_backup('backup', true)" db 2>&1 | $pgsql_log +$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_start_backup('backup', true)" db 2>&1 | sh $root/sqldb/logger echo "Content-type: application/x-compressed" echo tar -C $root/sqldb -cz data -$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_stop_backup()" db 2>&1 | $pgsql_log +$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_stop_backup()" db 2>&1 | sh $root/sqldb/logger diff --git a/sca-cpp/trunk/components/sqldb/pgsql-conf b/sca-cpp/trunk/components/sqldb/pgsql-conf index e3eb1c8dc3..6aa705f139 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-conf +++ b/sca-cpp/trunk/components/sqldb/pgsql-conf @@ -45,9 +45,11 @@ else mkdir -p $root/logs pgsql_log="cat >>$root/logs/postgresql" fi +mkdir -p $root/sqldb +echo $pgsql_log >$root/sqldb/logger if [ ! -f $root/sqldb/data/postgresql.conf ]; then - $pgsql_prefix/bin/pg_ctl init -D $root/sqldb/data 2>&1 | $pgsql_log + $pgsql_prefix/bin/pg_ctl init -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger cp $root/sqldb/data/postgresql.conf $root/sqldb/data/postgresql-init.conf cp $root/sqldb/data/pg_hba.conf $root/sqldb/data/pg_hba-init.conf fi @@ -96,7 +98,7 @@ host replication all samenet trust EOF # Create the db -($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | $pgsql_log)& +($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger sti=0 while [ $sti -ne 30 ]; do st=`$pgsql_prefix/bin/pg_ctl status -D $root/sqldb/data | grep 'server is running'` @@ -107,8 +109,8 @@ while [ $sti -ne 30 ]; do sti=$((sti+1)) done -$pgsql_prefix/bin/createdb -h localhost -p $port db 2>&1 | $pgsql_log -$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | $pgsql_log +$pgsql_prefix/bin/createdb -h localhost -p $port db 2>&1 | sh $root/sqldb/logger +$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger # Generate database backup script mkdir -p $root/sqldb/scripts diff --git a/sca-cpp/trunk/components/sqldb/pgsql-standby-conf b/sca-cpp/trunk/components/sqldb/pgsql-standby-conf index 291d950e94..59979f3ef2 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-standby-conf +++ b/sca-cpp/trunk/components/sqldb/pgsql-standby-conf @@ -54,6 +54,8 @@ else mkdir -p $root/logs pgsql_log="cat >>$root/logs/postgresql" fi +mkdir -p $root/sqldb +echo $pgsql_log >$root/sqldb/logger mkdir -p $root/sqldb/data chmod 700 $root/sqldb/data @@ -61,7 +63,7 @@ mkdir -p $root/sqldb/archive # Initialize from a backup of the master if [ ! -f $root/sqldb/data/postgresql.conf ]; then - (wget http://$mhost:$mhttpport/pgsql-backup -O - | tar -C $root/sqldb -xz) 2>&1 | $pgsql_log + (wget http://$mhost:$mhttpport/pgsql-backup -O - | tar -C $root/sqldb -xz) 2>&1 | sh $root/sqldb/logger rm -rf $root/sqldb/data/postmaster.pid $root/sqldb/data/pg_xlog mkdir -p $root/sqldb/data/pg_xlog/archive_status chmod 700 $root/sqldb/data/pg_xlog/archive_status diff --git a/sca-cpp/trunk/components/sqldb/pgsql-start b/sca-cpp/trunk/components/sqldb/pgsql-start index 9960c5d258..4a7e1ebe23 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-start +++ b/sca-cpp/trunk/components/sqldb/pgsql-start @@ -29,8 +29,10 @@ else mkdir -p $root/logs pgsql_log="cat >>$root/logs/postgresql" fi +mkdir -p $root/sqldb +echo $pgsql_log >$root/sqldb/logger -($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | $pgsql_log)& +($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger)& sti=0 while [ $sti -ne 30 ]; do st=`$pgsql_prefix/bin/pg_ctl status -D $root/sqldb/data | grep 'server is running'` diff --git a/sca-cpp/trunk/components/sqldb/pgsql-stop b/sca-cpp/trunk/components/sqldb/pgsql-stop index 9c5c9aae57..fbb9997961 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-stop +++ b/sca-cpp/trunk/components/sqldb/pgsql-stop @@ -29,6 +29,8 @@ else mkdir -p $root/logs pgsql_log="cat >>$root/logs/postgresql" fi +mkdir -p $root/sqldb +echo $pgsql_log >$root/sqldb/logger -$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | $pgsql_log +$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger |