mod_s2s: Don't try to close sessions that were destroyed before timeout

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 8fea3be59137c6d7dcf0f2e9ae7fe606ca91071d..51b9f5fe8e6b54a479dbb0eb75fbab4001157859 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -247,11 +247,10 @@ do
                                        end
                                end
                        else
+                               local file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file);
                                local f, err = io.open(file);
                                if f then
-                                       local data = f:read("*a");
-                                       local file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file);
-                                       local ret, err = parsers.lua.load(data, file, config);
+                                       local ret, err = parsers.lua.load(f:read("*a"), file, config);
                                        if not ret then error(err:gsub("%[string.-%]", file), 0); end
                                end
                                if not f then error("Error loading included "..file..": "..err, 0); end