prosody
175590cc7b07
prosodyctl

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

Software / code / prosody

Comparison

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
comparison
equal deleted inserted replaced
6059:0cbdf7243540 6068:175590cc7b07
412 return 1; 412 return 1;
413 end 413 end
414 414
415 local ok, ret = prosodyctl.start(); 415 local ok, ret = prosodyctl.start();
416 if ok then 416 if ok then
417 if config.get("*", "daemonize") ~= false then 417 local daemonize = config.get("*", "daemonize");
418 if daemonize == nil then
419 daemonize = prosody.installed;
420 end
421 if daemonize then
418 local i=1; 422 local i=1;
419 while true do 423 while true do
420 local ok, running = prosodyctl.isrunning(); 424 local ok, running = prosodyctl.isrunning();
421 if ok and running then 425 if ok and running then
422 break; 426 break;