diff --git a/scripts/archive_tower.sh b/scripts/archive_tower.sh index d14f3869afcef4ef3f46750e24bfe678dedfeefd..52cbca410e54e68b878aa87c1493646aa245daab 100755 --- a/scripts/archive_tower.sh +++ b/scripts/archive_tower.sh @@ -12,7 +12,7 @@ DATE=$1 if [ -z "$DATE" ]; then DATE=`date +%Y%m%d` fi -LOCK="${ENV}/locks/${SCRIPT_NAME}.lock" +LOCK="${LOCKDIR}/${SCRIPT_NAME}.lock" logfile="${LOGDIR}/${SCRIPT_NAME}.log" if [ ! -d $LOGDIR ]; then diff --git a/scripts/loggernet_rotate.sh b/scripts/loggernet_rotate.sh index e3458fa4769c6e0df109681c33bda6ef217f9b14..3b1fd2eb3f03393c948a276d916bddff1b15eda5 100755 --- a/scripts/loggernet_rotate.sh +++ b/scripts/loggernet_rotate.sh @@ -114,6 +114,8 @@ for file_suffix in $FILE_SUFFIXES; do cp $header_fn $input_file else # loggernet doesn't like empty destination files + # this could have been from a permissions issue during testing + # but I'm not going to change it now that it is working rm $input_file fi diff --git a/scripts/metobs_config.sh b/scripts/metobs_config.sh index c612e1a72a4447d9f5ee0634679881d229ce3389..552801e6a61a7df9b0e2dbfd9aa92cffc9a07116 100644 --- a/scripts/metobs_config.sh +++ b/scripts/metobs_config.sh @@ -11,7 +11,9 @@ export TOWER_CACHE_DIR="${DATA_ROOT}/cache/aoss/tower" # Python environment to use and where scripts are location export ENV=/opt/metobs/aoss_tower # Directory where logs will be stored -export LOGDIR=$ENV/logs +export LOGDIR=$ENV/log +# Directory where lock files will be stored +export LOCKDIR=$ENV/lock # Directory where work files can be placed (inside a separate temp directory) export WORKDIR="${DATA_ROOT}/tmp"