X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c249fadcc5ce27698d1f11fe5ec4a1c299786b3c..f2d42efa4aae8655e74a16fcb5e521a033e8dab3:/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 cbf34515b..77dc83312 100755
--- a/cookbooks/planet/files/default/replication-bin/replicate-changesets
+++ b/cookbooks/planet/files/default/replication-bin/replicate-changesets
@@ -143,7 +143,7 @@ class Replicator
   def initialize(config)
     @config = YAML.safe_load(File.read(config))
     @state = YAML.safe_load(File.read(@config["state_file"]), [Time])
-    @conn = PGconn.connect(@config["db"])
+    @conn = PG::Connection.connect(@config["db"])
     # get current time from the database rather than the current system
     @now = @conn.exec("select now() as now").map { |row| Time.parse(row["now"]) }[0]
   end
@@ -188,7 +188,7 @@ class Replicator
       "generator" => "replicate_changesets.rb",
       "copyright" => "OpenStreetMap and contributors",
       "attribution" => "https://www.openstreetmap.org/copyright",
-      "license" => "http://opendatacommons.org/licenses/odbl/1-0/" }
+      "license" => "https://opendatacommons.org/licenses/odbl/1-0/" }
       .each { |k, v| doc.root[k] = v }
 
     builder = ChangesetBuilder.new(@now, @conn)
@@ -261,8 +261,13 @@ class Replicator
 
   # saves new state (including the changeset dump xml)
   def save!
-    File.open(@config["state_file"], "r") do |fl|
-      fl.flock(File::LOCK_EX)
+    File.open(@config["lock_file"], File::RDWR | File::CREAT, 0o600) do |fl|
+      # take the lock in non-blocking mode. if this process doesn't get the lock
+      # then another will be run from cron shortly. this prevents a whole bunch
+      # 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
 
       # try and write the files to tmp locations and then
       # move them into place later, to avoid in-progress
@@ -278,7 +283,7 @@ class Replicator
 
         fl.flock(File::LOCK_UN)
       rescue StandardError
-        STDERR.puts("Error! Couldn't update state.")
+        warn "Error! Couldn't update state."
         fl.flock(File::LOCK_UN)
         raise
       end
@@ -290,6 +295,6 @@ begin
   rep = Replicator.new(ARGV[0])
   rep.save!
 rescue StandardError => e
-  STDERR.puts "ERROR: #{e.message}"
+  warn "ERROR: #{e.message}"
   exit 1
 end