Software / code / prosody
Diff
prosodyctl @ 6068:175590cc7b07
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 10 Apr 2014 13:16:54 +0200 |
| parent | 6062:6cc6b4d407df |
| child | 6158:08e9c9d0beb3 |
line wrap: on
line diff
--- a/prosodyctl Thu Apr 03 23:54:58 2014 +0200 +++ b/prosodyctl Thu Apr 10 13:16:54 2014 +0200 @@ -414,7 +414,11 @@ local ok, ret = prosodyctl.start(); if ok then - if config.get("*", "daemonize") ~= false then + local daemonize = config.get("*", "daemonize"); + if daemonize == nil then + daemonize = prosody.installed; + end + if daemonize then local i=1; while true do local ok, running = prosodyctl.isrunning();
