X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a50480f4da6d6f91a536763a0861ba5dcaa5c4f3..fd561c51f91e0ab94df124556acc7c9418b4f801:/cookbooks/planet/templates/default/planetdump.erb

diff --git a/cookbooks/planet/templates/default/planetdump.erb b/cookbooks/planet/templates/default/planetdump.erb
index d891fc2ea..bea56372c 100644
--- a/cookbooks/planet/templates/default/planetdump.erb
+++ b/cookbooks/planet/templates/default/planetdump.erb
@@ -19,19 +19,37 @@ date="${year:2:2}${BASH_REMATCH[2]}${BASH_REMATCH[3]}"
 # Check the lock
 if [ -f /tmp/planetdump.lock ]; then
     if [ "$(ps -p `cat /tmp/planetdump.lock` | wc -l)" -gt 1 ]; then
-	echo "Error: Another planetdump is running"
-	exit 1
+        echo "Error: Another planetdump is running"
+        exit 1
     else
-	rm /tmp/planetdump.lock
+        rm /tmp/planetdump.lock
     fi
 fi
 
-# Create Lock
+# Redirect this shell's output to a file. This is so that it
+# can be emailed later, since this script is run from incron
+# and incron doesn't yet support MAILTO like cron does. The
+# command below appears to work in bash as well as dash.
+logfile="/tmp/planetdump.log.$$"
+exec > "${logfile}" 2>&1
+
+# Create lock file
 echo $$ > /tmp/planetdump.lock
 
 # Define cleanup function
 function cleanup {
+    # Remove the lock file
     rm /tmp/planetdump.lock
+
+    # Send an email with the output, since incron doesn't yet
+    # support doing this in the incrontab
+    if [[ -s "$logfile" ]]
+    then
+        mailx -s "Planet dump output: ${file}" zerebubuth@gmail.com < "${logfile}"
+    fi
+
+    # Remove the log file
+    rm -f "${logfile}"
 }
 
 # Remove lock on exit
@@ -51,6 +69,7 @@ rm -rf relations relation_tags relation_members
 time nice -n 19 /opt/planet-dump-ng/planet-dump-ng \
      -c "pbzip2 -c" -f "/store/backup/${file}" --dense-nodes=1 \
      -C "changesets-${date}.osm.bz2" \
+     -D "discussions-${date}.osm.bz2" \
      -x "planet-${date}.osm.bz2" -X "history-${date}.osm.bz2" \
      -p "planet-${date}.osm.pbf" -P "history-${date}.osm.pbf"
 
@@ -73,6 +92,7 @@ function install_dump {
 
 # Move dumps into place
 install_dump "changesets" "bz2" "<%= node[:planet][:dump][:xml_directory] %>" "${year}"
+install_dump "discussions" "bz2" "<%= node[:planet][:dump][:xml_directory] %>" "${year}"
 install_dump "planet" "bz2" "<%= node[:planet][:dump][:xml_directory] %>" "${year}"
 install_dump "history" "bz2" "<%= node[:planet][:dump][:xml_history_directory] %>" "${year}"
 install_dump "planet" "pbf" "<%= node[:planet][:dump][:pbf_directory] %>"