prosody
d844e197eedf
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 9782:d844e197eedf

prosodyctl: Use the same runtime for starting prosody Improves the experience with the `make integration-test` command
author Kim Alvefur <zash@zash.se>
date Thu, 10 Jan 2019 15:25:38 +0100
parent 9780:c7727c13260f
child 9794:4b5c24f13d4a
comparison
equal deleted inserted replaced
9781:161411a41377 9782:d844e197eedf
220 show_message("Prosody is already running with PID %s", ret or "(unknown)"); 220 show_message("Prosody is already running with PID %s", ret or "(unknown)");
221 return 1; 221 return 1;
222 end 222 end
223 223
224 --luacheck: ignore 411/ret 224 --luacheck: ignore 411/ret
225 local ok, ret = prosodyctl.start(prosody.paths.source); 225 local ok, ret = prosodyctl.start(prosody.paths.source, arg[-1]);
226 if ok then 226 if ok then
227 local daemonize = configmanager.get("*", "daemonize"); 227 local daemonize = configmanager.get("*", "daemonize");
228 if daemonize == nil then 228 if daemonize == nil then
229 daemonize = prosody.installed; 229 daemonize = prosody.installed;
230 end 230 end