From: Grant Slater Date: Sat, 23 Aug 2014 13:15:55 +0000 (+0100) Subject: planet-notes-dump: move quiet option to correct place X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c1b0b484c303fd19f7682e8d7bf7d96c2c85bc2a?hp=d70ba4037b7d73ffad11fe8d91177b7118d7bd50;ds=inline planet-notes-dump: move quiet option to correct place --- diff --git a/cookbooks/planet/templates/default/planet-notes-dump.cron.erb b/cookbooks/planet/templates/default/planet-notes-dump.cron.erb index 40c07ed53..3c5709af1 100644 --- a/cookbooks/planet/templates/default/planet-notes-dump.cron.erb +++ b/cookbooks/planet/templates/default/planet-notes-dump.cron.erb @@ -1,5 +1,5 @@ MAILTO=grant-smaug@firefishy.com -0 3 * * * www-data /usr/local/bin/planet-notes-dump --quiet +0 3 * * * www-data /usr/local/bin/planet-notes-dump #Delete Planet Notes dump files older than 8 days 10 8 * * * www-data find /store/planet/notes/20??/ -maxdepth 1 -type f -iname 'planet-notes-??????.osn*' -printf '\%T@ \%p\n' | sort -k 1nr | sed 's/^[^ ]* //' | tail -n +17 | xargs -r rm -f diff --git a/cookbooks/planet/templates/default/planet-notes-dump.erb b/cookbooks/planet/templates/default/planet-notes-dump.erb index be94c941b..659510425 100644 --- a/cookbooks/planet/templates/default/planet-notes-dump.erb +++ b/cookbooks/planet/templates/default/planet-notes-dump.erb @@ -33,7 +33,7 @@ if [ \! -d ${planet_dir}/notes/ ] if [ \! -d ${planet_dir}/notes/${cur_year}/ ]; then mkdir ${planet_dir}/notes/${cur_year}/; fi cd ${planet_dir}/notes/${cur_year}/ -/usr/bin/python /opt/planet-notes-dump/dump.py --database openstreetmap --host db-slave --user planetdump --password '<%= @password %>' .${cur_planet_notes} +/usr/bin/python /opt/planet-notes-dump/dump.py --quiet --database openstreetmap --host db-slave --user planetdump --password '<%= @password %>' .${cur_planet_notes} pbzip2 -p6 -9 .${cur_planet_notes} planet_notes_size=$(du -sb .${cur_planet_notes}.bz2 | awk '{ print $1 }')