Replace incron with inotifywait as the planetdump trigger

[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 77dc83312e946354415b09112f1952ebffa550d7..8731c0d207a5e4f759c7e36de9821fec4ad859e4 100755 (executable)
--- 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
     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)
 
     # 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)
       # 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
 
       # try and write the files to tmp locations and then
       # move them into place later, to avoid in-progress


@@ -296,5 +294,8 @@ begin
   rep.save!
 rescue StandardError => e
   warn "ERROR: #{e.message}"
   rep.save!
 rescue StandardError => e
   warn "ERROR: #{e.message}"

+  e.backtrace.each do |frame|
+    warn "ERROR: #{frame}"
+  end

   exit 1
 end
   exit 1
 end