Correction : local/backup/*-snapshot : évite set -e : inactif dans les fonctions.

[lhc/ateliers.git] / local / backup / postgresql-snapshot

diff --git a/local/backup/postgresql-snapshot b/local/backup/postgresql-snapshot
index da34ee0..a9b3348 100755 (executable)
--- a/local/backup/postgresql-snapshot
+++ b/local/backup/postgresql-snapshot
@@ -15,32 +15,31 @@ test ! $# = 0 || set -- :
 install -d -m 770 -o backup -g backup \
  ~backup/snapshot/postgresql
 
-snapshot () {
-       local database="$1" && shift &&
-       test ! -e ~backup/snapshot/postgresql/"$database" &&
+trap_exit () {
+       errno=$?
+       test $errno = 0 ||
+       cat >&2 <<-EOF
+               ERROR: $0 "$database" "$@"
+               EOF
+       #return $errno
+ }
+trap trap_exit EXIT
+
+while IFS=' \r' read -r database
+ do
+       test "${database:+set}"
+       test ! -e ~backup/snapshot/postgresql/"$database"
                # NOTE: soit une sauvegarde est déjà en cours,
                #       soit une précédente a échoué.
        install -d -m 770 -o backup -g backup \
-        ~backup/snapshot/postgresql/"$database" &&
-       psql --quiet "$database" -c "VACUUM (ANALYSE);" &&
+        ~backup/snapshot/postgresql/"$database"
+       psql --quiet "$database" -c "VACUUM (ANALYSE);"
        pg_dump --blobs --compress 0 --format custom ${TRACE:+--verbose} \
         --file ~backup/snapshot/postgresql/"$database"/dump.sql \
-        "$database" &&
-       eval "$@" &&
+        "$database"
+       eval "$@"
        rm -rf \
-        ~backup/snapshot/postgresql/"$database" &&
-       :
- }
-
-exit=0
-while IFS=' \r' read -r database
- do if ! snapshot "$database" "$@"
-        then
-               exit=1
-               cat >&2 <<-EOF
-                       ERROR: snapshot "$database" "$@"
-                       EOF
-        fi
+        ~backup/snapshot/postgresql/"$database"
  done <<-EOF
        $(psql --quiet --tuples-only postgres <<-EOF || exit 1
                \set ON_ERROR_STOP on
@@ -51,4 +50,3 @@ while IFS=' \r' read -r database
                EOF
         )
        EOF
-exit $exit