Update rubocop

[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 455fcbc00d6d6bf0a0390628ea6458510e7cdb05..8c943902a8e91ad7d2869e9e8eb8182b429f7949 100644 (file)
--- a/cookbooks/planet/files/default/replication-bin/replicate-changesets
+++ b/cookbooks/planet/files/default/replication-bin/replicate-changesets
@@ -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"]))
     @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]
@@ -268,9 +268,9 @@ class Replicator
       # move them into place later, to avoid in-progress
       # clashes, or people seeing incomplete files.
       begin
+        changesets = open_changesets
         @state["sequence"] = sequence
         @state["last_run"] = @now
-        changesets = open_changesets
 
         write_tmp_files!(changesets)