aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-03-29 16:58:06 +0200
committerKim Alvefur <zash@zash.se>2018-03-29 16:58:06 +0200
commit36bdcaa99c41beece3985a80e9f4bbdfa86ef4c7 (patch)
treec0994da18bdaa499566223d829c33c0009ae32b0
parent8760f89c36fa2e16c730b267bcaee8999bdbd9b5 (diff)
downloadprosody-36bdcaa99c41beece3985a80e9f4bbdfa86ef4c7.tar.gz
prosody-36bdcaa99c41beece3985a80e9f4bbdfa86ef4c7.zip
core: Use prosody.hosts instead of _G.hosts for consistency
-rw-r--r--core/modulemanager.lua2
-rw-r--r--core/rostermanager.lua2
-rw-r--r--core/sessionmanager.lua2
-rw-r--r--core/storagemanager.lua2
-rw-r--r--core/usermanager.lua2
5 files changed, 5 insertions, 5 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index c23043df..60af8d79 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -15,8 +15,8 @@ local set = require "util.set";
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;
diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index c8b94734..aa1ba9f3 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -15,7 +15,7 @@ local pairs = pairs;
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;
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 4f2b3ecc..c9d4bce4 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -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;
diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index e5f48752..dea71733 100644
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -7,12 +7,12 @@ local config = require "core.configmanager";
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
diff --git a/core/usermanager.lua b/core/usermanager.lua
index ca1666ed..bb5669cf 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -13,11 +13,11 @@ local ipairs = ipairs;
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;