X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d9e4a452a85593a52ccef865ab9fe07ea78a9ae8..9b4b2aab7e2feeb21beeff9bce1e466d9c38dba5:/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 77dc83312..103be397a 100755 --- a/cookbooks/planet/files/default/replication-bin/replicate-changesets +++ b/cookbooks/planet/files/default/replication-bin/replicate-changesets @@ -216,9 +216,7 @@ class Replicator Zlib::GzipWriter.open(tmp_data) do |fh| fh.write(changeset_dump(changesets)) end - File.open(tmp_state, "w") do |fh| - fh.write(YAML.dump(@state)) - end + File.write(tmp_state, YAML.dump(@state)) # fsync the files in their old locations. fsync(tmp_data) @@ -267,7 +265,7 @@ class Replicator # of processes queueing on the lock and causing weirdness if/when they # get woken up in a random order. got_lock = fl.flock(File::LOCK_EX | File::LOCK_NB) - return unless got_lock + break unless got_lock # try and write the files to tmp locations and then # move them into place later, to avoid in-progress