diff options
Diffstat (limited to 'sca-cpp/trunk/components/sqldb')
-rwxr-xr-x | sca-cpp/trunk/components/sqldb/pgsql-conf | 2 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/sqldb/pgsql-standby-conf | 4 | ||||
-rw-r--r-- | sca-cpp/trunk/components/sqldb/pgsql.hpp | 4 |
3 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 4083160a02..2cfe47880b 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-conf +++ b/sca-cpp/trunk/components/sqldb/pgsql-conf @@ -98,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 | sh $root/sqldb/logger +($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-standby-conf b/sca-cpp/trunk/components/sqldb/pgsql-standby-conf index 59979f3ef2..b5dd238282 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-standby-conf +++ b/sca-cpp/trunk/components/sqldb/pgsql-standby-conf @@ -63,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 | sh $root/sqldb/logger + (curl -L http://$mhost:$mhttpport/pgsql-backup | 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 @@ -104,7 +104,7 @@ primary_conninfo = 'host=$mhost port=$mport' # Failover trigger_file = '$root/sqldb/failover' -restore_command = 'wget http://$mhost:$mhttpport/pgsql-archive/%f -O "%p"' +restore_command = 'curl http://$mhost:$mhttpport/pgsql-archive/%f -o "%p"' EOF diff --git a/sca-cpp/trunk/components/sqldb/pgsql.hpp b/sca-cpp/trunk/components/sqldb/pgsql.hpp index df9b2724ff..74d638f370 100644 --- a/sca-cpp/trunk/components/sqldb/pgsql.hpp +++ b/sca-cpp/trunk/components/sqldb/pgsql.hpp @@ -231,7 +231,9 @@ const failable<value> get(const value& key, const PGSql& pgsql) { return mkfailure<value>(string("Couldn't execute select postgresql SQL statement: ") + pgfailure(r, pgsql.conn)); if (PQntuples(r) < 1) { PQclear(r); - return mkfailure<value>(string("Couldn't get postgresql entry: ") + PQerrorMessage(pgsql.conn)); + ostringstream os; + os << "Couldn't get postgresql entry: " << key; + return mkfailure<value>(str(os)); } const char* data = PQgetvalue(r, 0, 1); const value val(scheme::readValue(string(data))); |