aboutsummaryrefslogtreecommitdiffstats
path: root/tools/migration
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-01-12 06:19:37 -0500
committerMatthew Wild <mwild1@gmail.com>2014-01-12 06:19:37 -0500
commite60a10abca1ce15ed341a72aaf1f8a3b7c3bf485 (patch)
tree2f864bdfbd0f83069da90282c6891e5c62d5a0f7 /tools/migration
parentece61cbae173be6abb4750578252f72c57b8eb8c (diff)
parente81051a18113ed666594b4669cbdf2a22a3cc79a (diff)
downloadprosody-e60a10abca1ce15ed341a72aaf1f8a3b7c3bf485.tar.gz
prosody-e60a10abca1ce15ed341a72aaf1f8a3b7c3bf485.zip
Merge 0.9->0.10
Diffstat (limited to 'tools/migration')
-rw-r--r--tools/migration/migrator/prosody_files.lua12
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/migration/migrator/prosody_files.lua b/tools/migration/migrator/prosody_files.lua
index 4462fb3e..c9367d9c 100644
--- a/tools/migration/migrator/prosody_files.lua
+++ b/tools/migration/migrator/prosody_files.lua
@@ -13,6 +13,7 @@ local next = next;
local pairs = pairs;
local json = require "util.json";
local os_getenv = os.getenv;
+local error = error;
prosody = {};
local dm = require "util.datamanager"
@@ -95,15 +96,18 @@ function reader(input)
local iter = mtools.sorted {
reader = function()
local x = iter();
- if x then
+ while x do
dm.set_data_path(path);
local err;
x.data, err = dm.load(x.user, x.host, x.store);
if x.data == nil and err then
- error(("Error loading data at path %s for %s@%s (%s store)")
- :format(path, x.user or "<nil>", x.host or "<nil>", x.store or "<nil>"), 0);
+ local p = dm.getpath(x.user, x.host, x.store);
+ print(("Error loading data at path %s for %s@%s (%s store): %s")
+ :format(p, x.user or "<nil>", x.host or "<nil>", x.store or "<nil>", err or "<nil>"));
+ else
+ return x;
end
- return x;
+ x = iter();
end
end;
sorter = function(a, b)