diff options
Diffstat (limited to 'sca-cpp/trunk/components/sqldb/pgsql-conf')
| -rwxr-xr-x | sca-cpp/trunk/components/sqldb/pgsql-conf | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/sca-cpp/trunk/components/sqldb/pgsql-conf b/sca-cpp/trunk/components/sqldb/pgsql-conf index f0ea218b25..e3eb1c8dc3 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-conf +++ b/sca-cpp/trunk/components/sqldb/pgsql-conf @@ -38,9 +38,16 @@ pgsql_prefix=`cat $here/pgsql.prefix` mkdir -p $root/sqldb/data chmod 700 $root/sqldb/data mkdir -p $root/sqldb/archive -mkdir -p $root/logs + +if [ -f "$root/sqldb/log.conf" ]; then + pgsql_log=`cat $root/sqldb/log.conf` +else + mkdir -p $root/logs + pgsql_log="cat >>$root/logs/postgresql" +fi + if [ ! -f $root/sqldb/data/postgresql.conf ]; then - $pgsql_prefix/bin/pg_ctl init -D $root/sqldb/data 1>>$root/logs/postgresql 2>&1 + $pgsql_prefix/bin/pg_ctl init -D $root/sqldb/data 2>&1 | $pgsql_log 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 @@ -51,6 +58,17 @@ cat >>$root/sqldb/data/postgresql.conf <<EOF # Generated by: pgsql-conf $* +# Setup logging +log_min_messages = INFO +log_min_error_statement = INFO +log_min_duration_statement = 0 +log_checkpoints = on +log_connections = on +log_disconnections = on +log_duration = on +log_lock_waits = on +log_statement = all + # Listen listen_addresses = '$ip' port = $port @@ -78,9 +96,19 @@ host replication all samenet trust EOF # Create the db -$pgsql_prefix/bin/pg_ctl start -w -D $root/sqldb/data -l $root/logs/postgresql 1>>$root/logs/postgresql 2>&1 -$pgsql_prefix/bin/createdb -h localhost -p $port db 1>>$root/logs/postgresql 2>&1 -$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 1>>$root/logs/postgresql 2>&1 +($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | $pgsql_log)& +sti=0 +while [ $sti -ne 30 ]; do + st=`$pgsql_prefix/bin/pg_ctl status -D $root/sqldb/data | grep 'server is running'` + if [ "$st" != "" ]; then + break + fi + sleep 1 + 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 # Generate database backup script mkdir -p $root/sqldb/scripts |