From 19efbef71530b46707f6da515f23cdfac3c24644 Mon Sep 17 00:00:00 2001 From: SJ Date: Tue, 9 Jul 2013 10:30:48 +0200 Subject: [PATCH] indexer job fixes --- util/indexer.delta.sh | 2 -- util/indexer.main.sh | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/util/indexer.delta.sh b/util/indexer.delta.sh index ee737d18..d47a9e61 100755 --- a/util/indexer.delta.sh +++ b/util/indexer.delta.sh @@ -19,8 +19,6 @@ trap finish EXIT echo "INDEXER INFO: indexing delta1 started" | logger -p $PRIORITY -5,35 2-23 * * * /usr/local/bin/indexer --quiet delta1 --rotate && sleep 2 && /usr/local/bin/indexer --quiet --merge dailydelta1 delta1 --merge-dst-range deleted 0 0 --rotate - $INDEXER --quiet delta1 --rotate echo "INDEXER INFO: indexing delta1 finished" | logger -p $PRIORITY diff --git a/util/indexer.main.sh b/util/indexer.main.sh index 0a03017d..5bc7b07d 100755 --- a/util/indexer.main.sh +++ b/util/indexer.main.sh @@ -5,7 +5,7 @@ MAINTMPFILE=/var/run/piler/main.indexer.tmp INDEXER=`which indexer` PRIORITY=mail.error -if [ -f $MAINTMPFILE ]; then echo "ERROR: indexer merging to main index is already running. It started at "`cat $MAINTMPFILE` | logger -p $PRIORITY ; exit 1; fi +if [ -f $MAINTMPFILE ]; then echo "INDEXER ERROR: indexer merging to main index is already running. It started at "`cat $MAINTMPFILE` | logger -p $PRIORITY ; exit 1; fi date > $MAINTMPFILE @@ -15,17 +15,17 @@ function finish { trap finish EXIT -echo "INFO: merging to main started" | logger -p $PRIORITY +echo "INDEXER INFO: merging to main started" | logger -p $PRIORITY $INDEXER --quiet --merge main1 dailydelta1 --merge-dst-range deleted 0 0 --rotate -echo "INFO: merging to main finished" | logger -p $PRIORITY +echo "INDEXER INFO: merging to main finished" | logger -p $PRIORITY sleep 5 -echo "INFO: resetting daily delta started" | logger -p $PRIORITY +echo "INDEXER INFO: resetting daily delta started" | logger -p $PRIORITY $INDEXER --quiet dailydelta1 --rotate -echo "INFO: resetting daily delta finished" | logger -p $PRIORITY +echo "INDEXER INFO: resetting daily delta finished" | logger -p $PRIORITY