lib/rbbt/persist.rb in rbbt-util-5.14.38 vs lib/rbbt/persist.rb in rbbt-util-5.14.39

@@ -251,19 +251,23 @@
       res
     end
   end
 
   def self.persist_file(path, type, persist_options, &block)
-    begin
-      if is_persisted?(path, persist_options)
-        Log.low "Persist up-to-date: #{ path } - #{Misc.fingerprint persist_options}"
-        return path if persist_options[:no_load]
-        return load_file(path, type) 
-      else
+    Misc.insist do
+      begin
+        if is_persisted?(path, persist_options)
+          Log.low "Persist up-to-date: #{ path } - #{Misc.fingerprint persist_options}"
+          return path if persist_options[:no_load]
+          return load_file(path, type) 
+        else
+          Open.rm path if Open.exists? path
+        end
+      rescue Exception
+        Log.warn "Exception loading persistence (#{ type }) #{ path }: #{$!.message}. Erase and retry."
         Open.rm path if Open.exists? path
+        raise $!
       end
-    rescue Exception
-      Open.rm path if Open.exists? path
     end
 
     lock_filename = Persist.persistence_path(path + '.persist', {:dir => Persist.lock_dir})
     begin
       lock_options = Misc.pull_keys persist_options, :lock