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

prosodyctl, util.prosodyctl: Pass source path as a parameter instead of global variable

Browse source
This commit is contained in:
Matthew Wild 2018-03-22 21:54:59 +00:00
parent 34473917a1
commit c0912560a4
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
prosodyctl
View file

@ -219,7 +219,7 @@ function commands.start(arg)
return 1;
end
local ok, ret = prosodyctl.start();
local ok, ret = prosodyctl.start(prosody.paths.source);
if ok then
local daemonize = config.get("*", "daemonize");
if daemonize == nil then

8
util/prosodyctl.lua
View file

@ -24,8 +24,6 @@ local io, os = io, os;
local print = print;
local tonumber = tonumber;
local CFG_SOURCEDIR = _G.CFG_SOURCEDIR;
local _G = _G;
local prosody = prosody;
@ -231,7 +229,7 @@ local function isrunning()
return true, signal.kill(pid, 0) == 0;
end
local function start()
local function start(source_dir)
local ok, ret = isrunning();
if not ok then
return ok, ret;
@ -239,10 +237,10 @@ local function start()
if ret then
return false, "already-running";
end
if not CFG_SOURCEDIR then
if not source_dir then
os.execute("./prosody");
else
os.execute(CFG_SOURCEDIR.."/../../bin/prosody");
os.execute(source_dir.."/../../bin/prosody");
end
return true;
end