X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3d2e9b462de5b71d75048c31e98621b2752dd72a..46a09a81fe5084a5d031bac181a5cbb26795c718:/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 c87183fbb..0a6b4242d 100755 --- a/cookbooks/planet/files/default/replication-bin/replicate-changesets +++ b/cookbooks/planet/files/default/replication-bin/replicate-changesets @@ -127,7 +127,7 @@ end # sync a directory to guarantee it's on disk. have to recurse to the root # to guarantee sync for newly created directories. def fdirsync(d) - while d != "/" + while d != "/" && d != "." fsync(d) d = File.dirname(d) end @@ -139,7 +139,7 @@ end class Replicator def initialize(config) @config = YAML.safe_load(File.read(config)) - @state = YAML.safe_load(File.read(@config["state_file"]), :permitted_classes => [Time]) + @state = YAML.safe_load(File.read(@config["state_file"]), :permitted_classes => [Time], :fallback => {}) @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]