X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8df838bf09d95282ba29ddde8b504e0affc5f06e..0aaea8096fcdd565f0f1990a84ad68e9aeb90113:/cookbooks/planet/files/default/replication-bin/replicate-changesets?ds=sidebyside diff --git a/cookbooks/planet/files/default/replication-bin/replicate-changesets b/cookbooks/planet/files/default/replication-bin/replicate-changesets index 92103bb1f..29131b2ed 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 @@ -187,8 +187,8 @@ class Replicator { "version" => "0.6", "generator" => "replicate_changesets.rb", "copyright" => "OpenStreetMap and contributors", - "attribution" => "http://www.openstreetmap.org/copyright", - "license" => "http://opendatacommons.org/licenses/odbl/1-0/" } + "attribution" => "https://www.openstreetmap.org/copyright", + "license" => "https://opendatacommons.org/licenses/odbl/1-0/" } .each { |k, v| doc.root[k] = v } builder = ChangesetBuilder.new(@now, @conn) @@ -278,7 +278,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 +290,6 @@ begin rep = Replicator.new(ARGV[0]) rep.save! rescue StandardError => e - STDERR.puts "ERROR: #{e.message}" + warn "ERROR: #{e.message}" exit 1 end