projects
/
chef.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
15c73dd
)
Convert tabs to spaces
author
Paul Norman
<penorman@mac.com>
Thu, 28 Jan 2016 22:50:58 +0000
(14:50 -0800)
committer
Paul Norman
<penorman@mac.com>
Thu, 28 Jan 2016 22:52:52 +0000
(14:52 -0800)
cookbooks/tile/templates/default/replicate.erb
patch
|
blob
|
history
diff --git
a/cookbooks/tile/templates/default/replicate.erb
b/cookbooks/tile/templates/default/replicate.erb
index e1ecab695d27ba0a68ac8c5b864076713c394207..24e41819846c13fccdb89bce29739e45164cf8a1 100644
(file)
--- a/
cookbooks/tile/templates/default/replicate.erb
+++ b/
cookbooks/tile/templates/default/replicate.erb
@@
-39,31
+39,31
@@
do
if [ $? -eq 0 ]
then
# Enable exit on error
if [ $? -eq 0 ]
then
# Enable exit on error
- set -e
+
set -e
# Remember the previous sequence number
# Remember the previous sequence number
- prevSequenceNumber=$sequenceNumber
+
prevSequenceNumber=$sequenceNumber
# Read in new state
# Read in new state
- . state.txt
+
. state.txt
# Did we get any new data?
# Did we get any new data?
- if [ "${sequenceNumber}" == "${prevSequenceNumber}" ]
+
if [ "${sequenceNumber}" == "${prevSequenceNumber}" ]
then
# Log the lack of data
then
# Log the lack of data
- echo "No new data available. Sleeping..."
+
echo "No new data available. Sleeping..."
- # Remove file, it will just be an empty changeset
- rm ${file}
+
# Remove file, it will just be an empty changeset
+
rm ${file}
# No need to rollback now
rm state-prev.txt
# Sleep for a short while
# No need to rollback now
rm state-prev.txt
# Sleep for a short while
- sleep 30
- else
+
sleep 30
+
else
# Log the new data
# Log the new data
- echo "Fetched new data from ${prevSequenceNumber} to ${sequenceNumber} into ${file}"
+
echo "Fetched new data from ${prevSequenceNumber} to ${sequenceNumber} into ${file}"
# Apply the changes to the database
<% if node[:tile][:node_file] -%>
# Apply the changes to the database
<% if node[:tile][:node_file] -%>
@@
-77,18
+77,18
@@
do
# Expire tiles which are touched by the changes
sudo -u www-data /usr/local/bin/expire-tiles ${file} > /dev/null 2>&1 &
# Expire tiles which are touched by the changes
sudo -u www-data /usr/local/bin/expire-tiles ${file} > /dev/null 2>&1 &
- fi
+
fi
# Delete old downloads
# Delete old downloads
- find . -name 'changes-*.gz' -mmin +300 -exec rm -f {} \;
+
find . -name 'changes-*.gz' -mmin +300 -exec rm -f {} \;
# Disable exit on error
set +e
else
# Log our failure to fetch changes
# Disable exit on error
set +e
else
# Log our failure to fetch changes
- echo "Failed to fetch changes - waiting a few minutes before retry"
+
echo "Failed to fetch changes - waiting a few minutes before retry"
# Wait five minutes and have another go
# Wait five minutes and have another go
- sleep 300
+
sleep 300
fi
done
fi
done