From ddc9054b038744f98382f1719150e8b94212dd16 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Thu, 9 Jul 2015 18:53:51 +0300 Subject: [PATCH] [generator] Mail on coastline merge failure --- tools/unix/generate_planet.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh index e666619d65..0b8f6c782e 100755 --- a/tools/unix/generate_planet.sh +++ b/tools/unix/generate_planet.sh @@ -123,7 +123,7 @@ mkdir -p "$TARGET" INTDIR="${INTDIR:-$TARGET/intermediate_data}" OSMCTOOLS="${OSMCTOOLS:-$HOME/osmctools}" [ ! -d "$OSMCTOOLS" ] && OSMCTOOLS="$INTDIR" -MERGE_COASTS_DELAY_SEC=2400 +MERGE_COASTS_DELAY_MIN=40 # set to "mem" if there is more than 64 GB of memory NODE_STORAGE=${NODE_STORAGE:-${NS:-mem}} ASYNC_PBF=${ASYNC_PBF-} @@ -246,9 +246,10 @@ if [ "$MODE" == "coast" ]; then if [ $? != 0 ]; then log "TIMEMARK" "Coastline merge failed" if [ -n "$OPT_UPDATE" ]; then + tail -n 50 "$LOG_PATH/WorldCoasts.log" | mailx -s "Generate_planet: coastline merge failed, next try in $MERGE_COASTS_DELAY_MIN minutes" "$MAIL" date -u - echo "Will try fresh coasts again in $MERGE_COASTS_DELAY_SEC seconds, or press a key..." - read -rs -n 1 -t $MERGE_COASTS_DELAY_SEC + echo "Will try fresh coasts again in $MERGE_COASTS_DELAY_MIN minutes, or press a key..." + read -rs -n 1 -t $(expr $MERGE_COASTS_DELAY_MIN \* 60) TRY_AGAIN=1 else fail