]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/planet/files/default/replication-bin/replicate-changesets
Convert various links to https
[chef.git] / cookbooks / planet / files / default / replication-bin / replicate-changesets
old mode 100644 (file)
new mode 100755 (executable)
index 9e16151..cbf3451
@@ -100,7 +100,7 @@ class ChangesetBuilder
     xml["comments_count"] = res.num_tuples.to_s
 
     # early return if there aren't any comments
-    return unless res.num_tuples > 0
+    return unless res.num_tuples.positive?
 
     discussion = XML::Node.new("discussion")
     res.each do |row|
@@ -141,8 +141,8 @@ end
 # replicated to a file.
 class Replicator
   def initialize(config)
-    @config = YAML.load(File.read(config))
-    @state = YAML.load(File.read(@config["state_file"]))
+    @config = YAML.safe_load(File.read(config))
+    @state = YAML.safe_load(File.read(@config["state_file"]), [Time])
     @conn = PGconn.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]
@@ -167,7 +167,7 @@ class Replicator
     new_ids = @conn
               .exec("select distinct changeset_id from changeset_comments where created_at >= '#{last_run}' and created_at < '#{@now}' and visible")
               .map { |row| row["changeset_id"].to_i }
-              .select { |c_id| !cs_ids.include?(c_id) }
+              .reject { |c_id| cs_ids.include?(c_id) }
 
     new_ids.each do |id|
       @conn
@@ -187,7 +187,7 @@ class Replicator
     { "version" => "0.6",
       "generator" => "replicate_changesets.rb",
       "copyright" => "OpenStreetMap and contributors",
-      "attribution" => "http://www.openstreetmap.org/copyright",
+      "attribution" => "https://www.openstreetmap.org/copyright",
       "license" => "http://opendatacommons.org/licenses/odbl/1-0/" }
       .each { |k, v| doc.root[k] = v }
 
@@ -277,8 +277,7 @@ class Replicator
         move_tmp_files_into_place!
 
         fl.flock(File::LOCK_UN)
-
-      rescue
+      rescue StandardError
         STDERR.puts("Error! Couldn't update state.")
         fl.flock(File::LOCK_UN)
         raise