Cleanup temporary directory

[chef.git] / cookbooks / tilelog / templates / default / tilelog.erb

diff --git a/cookbooks/tilelog/templates/default/tilelog.erb b/cookbooks/tilelog/templates/default/tilelog.erb
index 598c1e127770eaadafcde00f3c3e69227c06db8a..7e2e23fd7c08181d313621ae9c322e82812f8be8 100644 (file)
--- a/cookbooks/tilelog/templates/default/tilelog.erb
+++ b/cookbooks/tilelog/templates/default/tilelog.erb
@@ -1,28 +1,19 @@
 #!/bin/sh
 
 #!/bin/sh
 

-ANALYZE=<%= @analyze_bin %>
-LOGDIR=<%= @input_dir %>
-OUTDIR=<%= @output_dir %>
-if [ -z "$DATE" ]; then
-               DATE=`date -d "1 day ago" "+%Y-%m-%d"`
+if [ -z "$DATE" ]
+then
+  DATE=$(date -d "1 day ago" "+%Y-%m-%d")

 fi
 fi

-TMPDIR=`mktemp -d -t tmp.XXXXXXXXX`
-ORIGDIR=`pwd`

 
 

-clean_up() {
-               cd $ORIGDIR
-               rm -rf $TMPDIR
-}
+OUTDIR="<%= @output_dir %>"
+TMPDIR=$(mktemp -d -t tilelog.XXXXXXXXX)

 
 

-trap clean_up 0 HUP INT TERM

 cd $TMPDIR
 
 cd $TMPDIR
 

-mkdir db
-nice -n 19 $ANALYZE $LOGDIR/*-${DATE}.xz > analyze.log
-if [ -f tiles.txt ]; then
-               nice -n 19 xz -9e -z tiles.txt
-               mv tiles.txt.xz $OUTDIR/tiles-${DATE}.txt.xz
+export AWS_ACCESS_KEY_ID="AKIASQUXHPE7JFCFMOUP"
+export AWS_SECRET_ACCESS_KEY="<%= @aws_key %>"
+export AWS_REGION="eu-west-1"

 
 

-else
-               cat analyze.log
-fi
+nice -n 19 /opt/tilelog/bin/tilelog --date ${DATE} && mv tiles-${DATE}.txt.xz "${OUTDIR}"
+
+rm -rf $TMPDIR