aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-01-04 21:18:35 +0000
committerMatthew Wild <mwild1@gmail.com>2011-01-04 21:18:35 +0000
commit943409e595fcffa6ae27043af3b8e3387a48a1fa (patch)
tree1013a0b2d16754f63a939a24b838abeab0a16996
parentabd55f9e2c1c7972f8f25385fa07c8ac2ae0f4cf (diff)
downloadprosody-943409e595fcffa6ae27043af3b8e3387a48a1fa.tar.gz
prosody-943409e595fcffa6ae27043af3b8e3387a48a1fa.zip
prosody, prosodyctl: Create prosody object as a local before exporting as a global
-rwxr-xr-xprosody4
-rwxr-xr-xprosodyctl4
2 files changed, 4 insertions, 4 deletions
diff --git a/prosody b/prosody
index 7c819214..b093e4fd 100755
--- a/prosody
+++ b/prosody
@@ -32,8 +32,8 @@ if CFG_DATADIR then
end
-- Global 'prosody' object
-prosody = { events = require "util.events".new(); };
-local prosody = prosody;
+local prosody = { events = require "util.events".new(); };
+_G.prosody = prosody;
-- Check dependencies
local dependencies = require "util.dependencies";
diff --git a/prosodyctl b/prosodyctl
index 9630a9b8..dae9268a 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -32,14 +32,14 @@ if CFG_DATADIR then
end
-- Global 'prosody' object
-prosody = {
+local prosody = {
hosts = {};
events = require "util.events".new();
platform = "posix";
lock_globals = function () end;
unlock_globals = function () end;
};
-local prosody = prosody;
+_G.prosody = prosody;
local dependencies = require "util.dependencies";
if not dependencies.check_dependencies() then