Skip to content

Add check for OVERPASS_DIFF_URL in rules_loop.sh, removing irrelevant rules update in case where there are no updates #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
XPav wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add check for OVERPASS_DIFF_URL in rules_loop.sh, removing irrelevant rules update in case where there are no updates #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions bin/rules_loop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,20 @@ pushd "$EXEC_DIR" || exit 1

while true; do
{
START=$(date +%s)
echo "$(date '+%F %T'): update started" >>"$DB_DIR/rules_loop.log"
./osm3s_query --progress --rules <"$DB_DIR/rules/areas.osm3s"
echo "$(date '+%F %T'): update finished" >>"$DB_DIR/rules_loop.log"
WORK_TIME=$(($(date +%s) - START))
SLEEP_TIME=$((WORK_TIME * 100 / CPU_LOAD - WORK_TIME))
# let SLEEP_TIME be at least 3 seconds
SLEEP_TIME=$((SLEEP_TIME < 3 ? 3 : SLEEP_TIME))
echo "It took $WORK_TIME to run the loop. Desired load is: ${CPU_LOAD}%. Sleeping: $SLEEP_TIME"
sleep "$SLEEP_TIME"
if [[ -z "${OVERPASS_DIFF_URL}" ]]; then
echo "OVERPASS_DIFF_URL is not set - updates disabled, assuming areas created on init, sleeping forever"
sleep infinity
else
START=$(date +%s)
echo "$(date '+%F %T'): update started" >>"$DB_DIR/rules_loop.log"
./osm3s_query --progress --rules <"$DB_DIR/rules/areas.osm3s"
echo "$(date '+%F %T'): update finished" >>"$DB_DIR/rules_loop.log"
WORK_TIME=$(($(date +%s) - START))
SLEEP_TIME=$((WORK_TIME * 100 / CPU_LOAD - WORK_TIME))
# let SLEEP_TIME be at least 3 seconds
SLEEP_TIME=$((SLEEP_TIME < 3 ? 3 : SLEEP_TIME))
echo "It took $WORK_TIME to run the loop. Desired load is: ${CPU_LOAD}%. Sleeping: $SLEEP_TIME"
sleep "$SLEEP_TIME"
fi
}
done