mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools/migration/migrator/prosody_files: Fix undefined global access of ‘error’, print the actual error message and correct file path in the error message when we fail to load a file, skip broken files instead of failing migration.

Browse source
This commit is contained in:
Waqas Hussain 2014-01-03 15:52:52 -05:00
parent a3dab92bb3
commit 814d446911
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/migration/migrator/prosody_files.lua
View file

@ -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)