diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-25 01:42:59 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-25 01:42:59 +0200 |
| commit | d10300eca4067bdc68a16675a4065f608c88381d (patch) | |
| tree | 76b402f43306dd2f1a20dd5b16f9fe1bf9c15a42 /util | |
| parent | 706849aa1ef9f5f2f6494d14d7de0ac9e1647190 (diff) | |
| parent | 237f991e4f843ea2448fac2563149b6671e5c885 (diff) | |
| download | prosody-d10300eca4067bdc68a16675a4065f608c88381d.tar.gz prosody-d10300eca4067bdc68a16675a4065f608c88381d.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/prosodyctl.lua | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua index 7c9a3c19..8ae051ae 100644 --- a/util/prosodyctl.lua +++ b/util/prosodyctl.lua @@ -187,6 +187,8 @@ local function getpid() return false, "invalid-pidfile"; end + pidfile = config.resolve_relative_path(prosody.paths.data, pidfile); + local modules_enabled = set.new(config.get("*", "modules_disabled")); if prosody.platform ~= "posix" or modules_enabled:contains("posix") then return false, "no-posix"; |