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/sqldb/pgsql-conf | |
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 'sca-cpp/trunk/components/sqldb/pgsql-conf')
-rwxr-xr-x | sca-cpp/trunk/components/sqldb/pgsql-conf | 10 |
1 files changed, 6 insertions, 4 deletions
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 |