diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-04-25 12:35:13 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-04-25 12:35:13 +0100 |
| commit | a2a9c525db3e62f738cd3a607d71e57d782e3ec1 (patch) | |
| tree | 4cfe5fcc4b58161dd61b2aeff9f07d2cb910c3e4 | |
| parent | d5c962d2a51104133deac97d959215e9eed564e3 (diff) | |
| parent | 82d95f050dbe18576daf36e953d9c2e01330e517 (diff) | |
Merge branch 'issues/1338-noisy-compact-xapan-database' into rails-3-develop
| m--------- | commonlib | 0 | ||||
| -rwxr-xr-x | script/compact-xapian-database | 35 |
2 files changed, 20 insertions, 15 deletions
diff --git a/commonlib b/commonlib -Subproject 438003985e1bfb90fb83f5bbc5dce3da3fb21ee +Subproject 25fbbc5d4c486297e5fbdb85989bdacb1e86756 diff --git a/script/compact-xapian-database b/script/compact-xapian-database index 982c0e878..075a71cd8 100755 --- a/script/compact-xapian-database +++ b/script/compact-xapian-database @@ -3,23 +3,28 @@ export RAILS_ENV=$1 set -e -if [ -x /usr/bin/xapian-compact ]; then - XAPIAN_DB_DIR=$( cd "$( dirname "$0" )" && pwd )/../lib/acts_as_xapian/xapiandbs - if [ -e "$XAPIAN_DB_DIR/$RAILS_ENV.new" ]; then - echo >&2 "Didn't compact Xapian database because there was an existing database at $XAPIAN_DB_DIR/$RAILS_ENV.new" - exit 1 - else - OWNER=$(stat -c %U "$XAPIAN_DB_DIR/$RAILS_ENV") - export XAPIAN_DB_DIR RAILS_ENV - su "$OWNER" <<SU - xapian-compact "\$XAPIAN_DB_DIR/\$RAILS_ENV" "\$XAPIAN_DB_DIR/\$RAILS_ENV.new" +cd "$(dirname "$0")"/.. + +if [ -x /usr/bin/xapian-compact ]; + then + XAPIAN_DB_DIR=$( pwd )/lib/acts_as_xapian/xapiandbs + + if [ -e "$XAPIAN_DB_DIR/$RAILS_ENV.new" ]; + then + echo >&2 "Didn't compact Xapian database because there was an existing database at $XAPIAN_DB_DIR/$RAILS_ENV.new" + exit 1 + else + OWNER=$(stat -c %U "$XAPIAN_DB_DIR/$RAILS_ENV") + export XAPIAN_DB_DIR RAILS_ENV + su "$OWNER" <<SU +commonlib/bin/output-on-error xapian-compact "\$XAPIAN_DB_DIR/\$RAILS_ENV" "\$XAPIAN_DB_DIR/\$RAILS_ENV.new" SU - mv "$XAPIAN_DB_DIR/$RAILS_ENV" "$XAPIAN_DB_DIR/$RAILS_ENV.tmp" - mv "$XAPIAN_DB_DIR/$RAILS_ENV.new" "$XAPIAN_DB_DIR/$RAILS_ENV" - rm -rf "$XAPIAN_DB_DIR/$RAILS_ENV.tmp" - /etc/init.d/apache2 restart + mv "$XAPIAN_DB_DIR/$RAILS_ENV" "$XAPIAN_DB_DIR/$RAILS_ENV.tmp" + mv "$XAPIAN_DB_DIR/$RAILS_ENV.new" "$XAPIAN_DB_DIR/$RAILS_ENV" + rm -rf "$XAPIAN_DB_DIR/$RAILS_ENV.tmp" + commonlib/bin/output-on-error /etc/init.d/apache2 restart fi -else + else echo >&2 "Could not find xapian-compact script; have you installed xapian-tools?" exit 1 fi |