diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2002-03-18 20:25:12 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2002-03-18 20:25:12 +0000 |
| commit | 8ba8941303fd6e3a18ba652166b3b98b4b17537a (patch) | |
| tree | e1775569249f1c63a17bf7ac44bf7e18a2e42013 /localwebsearch | |
| parent | ba5d29860246b91e8cff948b50943510822f3fa7 (diff) | |
Move lockfile routines closer to where it is actually needed in localwebsearch - and disable it, as it doesn't work currently :-(
Diffstat (limited to 'localwebsearch')
| -rwxr-xr-x | localwebsearch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/localwebsearch b/localwebsearch index 7cc32d8..95c6655 100755 --- a/localwebsearch +++ b/localwebsearch @@ -3,7 +3,7 @@ # /usr/local/sbin/localwebsearch # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: localwebsearch,v 1.3 2002-03-07 16:22:51 jonas Exp $ +# $Id: localwebsearch,v 1.4 2002-03-18 20:25:12 jonas Exp $ # # Web search engine maintenance script # @@ -121,16 +121,6 @@ for WEBSITE in $WEBSITES; do HTDIG_OPTIONS="$HTDIG_OPTIONS -i" fi - if ! lockfile-create /var/run/localwebsearch_$WEBSITE; then - # Another htdig indexing cronjob is already running - [ $DEBUG ] && echo "Another $WEBSITE indexing is already running. Exit silently..." - exit 0 - fi - - lockfile-touch /var/run/localwebsearch_$WEBSITE & - # Save the PID of the lockfile-touch process - BADGER="$!" - if [ "$stamp" = "initprep" ]; then [ $DEBUG ] && echo "Mark next run as a full-scale, and exit silently..." touch /etc/htdig/full_refresh_$WEBSITE @@ -159,6 +149,16 @@ LANGUAGE DANISH fi fi +# if ! lockfile-create /var/run/localwebsearch_$WEBSITE; then +# # Another htdig indexing cronjob is already running +# [ $DEBUG ] && echo "Another $WEBSITE indexing is already running. Exit silently..." +# exit 0 +# fi + +# lockfile-touch /var/run/localwebsearch_$WEBSITE & +# # Save the PID of the lockfile-touch process +# BADGER="$!" + if [ $stamp = "init" -o $stamp = "update" ]; then if [ -x $HTDIG_BIN -a -x $HTDIG_REAL_BIN ]; then export TMPDIR=/tmp @@ -172,6 +172,9 @@ LANGUAGE DANISH fi fi +# kill "${BADGER}" +# lockfile-remove /var/run/localwebsearch_$WEBSITE + if [ $stamp = "init" ]; then [ $DEBUG ] && echo "Execute $WEBSITE POST_INIT" post_init $LOGROOT $WEBROOT $WEBSITE || exit1 "Error executing POST_INIT." @@ -181,7 +184,4 @@ LANGUAGE DANISH post_update $LOGROOT $WEBROOT $WEBSITE || exit1 "Error executing POST_UPDATE." fi - kill "${BADGER}" - lockfile-remove /var/run/localwebsearch_$WEBSITE - done |