Centralise definition of read/write and readonly database servers

[chef.git] / cookbooks / planet / files / default / replication-bin / replicate-changesets

diff --git a/cookbooks/planet/files/default/replication-bin/replicate-changesets b/cookbooks/planet/files/default/replication-bin/replicate-changesets
index 8fd78a1bc33e1dfee2a81a535d26b24d30290d7e..fb3d6138af0dc0686c8b19b0c2f30847ffefe4a5 100644 (file)
--- a/cookbooks/planet/files/default/replication-bin/replicate-changesets
+++ b/cookbooks/planet/files/default/replication-bin/replicate-changesets
@@ -18,7 +18,7 @@ GEO_SCALE = 10000000
 ##
 # replace characters which cannot be represented in XML 1.0.
 def xml_sanitize(str)
 ##
 # replace characters which cannot be represented in XML 1.0.
 def xml_sanitize(str)

-  str.gsub(/[\x00-\x08\x0b\x0c\x0e-\x20]/, "?")
+  str.gsub(/[\x00-\x08\x0b\x0c\x0e-\x1f]/, "?")

 end
 
 ##
 end
 
 ##


@@ -204,10 +204,10 @@ class Replicator
 
         # sanity check: the files we're moving into place
         # should be non-empty.
 
         # sanity check: the files we're moving into place
         # should be non-empty.

-        fail "Temporary gzip file should exist, but doesn't." unless File.exist?(tmp_data)
-        fail "Temporary state file should exist, but doesn't." unless File.exist?(tmp_state)
-        fail "Temporary gzip file should be non-empty, but isn't." if File.zero?(tmp_data)
-        fail "Temporary state file should be non-empty, but isn't." if File.zero?(tmp_state)
+        raise "Temporary gzip file should exist, but doesn't." unless File.exist?(tmp_data)
+        raise "Temporary state file should exist, but doesn't." unless File.exist?(tmp_state)
+        raise "Temporary gzip file should be non-empty, but isn't." if File.zero?(tmp_data)
+        raise "Temporary state file should be non-empty, but isn't." if File.zero?(tmp_state)

 
         FileUtils.mv(tmp_data, data_file)
         FileUtils.mv(tmp_state, @config["state_file"])
 
         FileUtils.mv(tmp_data, data_file)
         FileUtils.mv(tmp_state, @config["state_file"])