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 | 30a4f36e03d8fad67839ee27ee037967ab50b385 (patch) | |
| tree | 76b402f43306dd2f1a20dd5b16f9fe1bf9c15a42 /util | |
| parent | d53fffb30e060a0b2059d32707ac7b45966375f0 (diff) | |
| parent | 42cd234969a1c68f54c6a804649ef9746e95f148 (diff) | |
| download | prosody-30a4f36e03d8fad67839ee27ee037967ab50b385.tar.gz prosody-30a4f36e03d8fad67839ee27ee037967ab50b385.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"; |