core: Use prosody.hosts instead of _G.hosts for consistency
authorKim Alvefur <zash@zash.se>
Thu, 29 Mar 2018 16:58:06 +0200
changeset 8720 9ddd0fbbe53a
parent 8719 2f3b08ad9b8a
child 8721 c23cdeac5b61
core: Use prosody.hosts instead of _G.hosts for consistency
core/modulemanager.lua
core/rostermanager.lua
core/sessionmanager.lua
core/storagemanager.lua
core/usermanager.lua
--- a/core/modulemanager.lua	Thu Mar 29 16:42:24 2018 +0200
+++ b/core/modulemanager.lua	Thu Mar 29 16:58:06 2018 +0200
@@ -15,8 +15,8 @@
 local new_multitable = require "util.multitable".new;
 local api = require "core.moduleapi"; -- Module API container
 
-local hosts = hosts;
 local prosody = prosody;
+local hosts = prosody.hosts;
 
 local xpcall = xpcall;
 local setmetatable, rawget = setmetatable, rawget;
--- a/core/rostermanager.lua	Thu Mar 29 16:42:24 2018 +0200
+++ b/core/rostermanager.lua	Thu Mar 29 16:58:06 2018 +0200
@@ -15,7 +15,7 @@
 local tostring = tostring;
 local type = type;
 
-local hosts = hosts;
+local hosts = prosody.hosts;
 local bare_sessions = prosody.bare_sessions;
 
 local um_user_exists = require "core.usermanager".user_exists;
--- a/core/sessionmanager.lua	Thu Mar 29 16:42:24 2018 +0200
+++ b/core/sessionmanager.lua	Thu Mar 29 16:58:06 2018 +0200
@@ -10,7 +10,7 @@
 local tostring, setmetatable = tostring, setmetatable;
 local pairs, next= pairs, next;
 
-local hosts = hosts;
+local hosts = prosody.hosts;
 local full_sessions = prosody.full_sessions;
 local bare_sessions = prosody.bare_sessions;
 
--- a/core/storagemanager.lua	Thu Mar 29 16:42:24 2018 +0200
+++ b/core/storagemanager.lua	Thu Mar 29 16:58:06 2018 +0200
@@ -7,12 +7,12 @@
 local datamanager = require "util.datamanager";
 local modulemanager = require "core.modulemanager";
 local multitable = require "util.multitable";
-local hosts = hosts;
 local log = require "util.logger".init("storagemanager");
 local async = require "util.async";
 local debug = debug;
 
 local prosody = prosody;
+local hosts = prosody.hosts;
 
 local _ENV = nil;
 -- luacheck: std none
--- a/core/usermanager.lua	Thu Mar 29 16:42:24 2018 +0200
+++ b/core/usermanager.lua	Thu Mar 29 16:58:06 2018 +0200
@@ -13,11 +13,11 @@
 local jid_bare = require "util.jid".bare;
 local jid_prep = require "util.jid".prep;
 local config = require "core.configmanager";
-local hosts = hosts;
 local sasl_new = require "util.sasl".new;
 local storagemanager = require "core.storagemanager";
 
 local prosody = _G.prosody;
+local hosts = prosody.hosts;
 
 local setmetatable = setmetatable;