Comparison

prosodyctl @ 4541:05f5ec99da77

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 22 Jan 2012 22:55:49 +0000
parent 4476:53ce21286b8c
child 4487:5f466a50e78b
comparison
equal deleted inserted replaced
4530:40905e7bf680 4541:05f5ec99da77
538 print(""); 538 print("");
539 end 539 end
540 540
541 function commands.reload(arg) 541 function commands.reload(arg)
542 if arg[1] == "--help" then 542 if arg[1] == "--help" then
543 show_usage([[reload]], [[Reload prosody configuration file]]); 543 show_usage([[reload]], [[Reload Prosody's configuration and re-open log files]]);
544 return 1; 544 return 1;
545 end 545 end
546 546
547 if not prosodyctl.isrunning() then 547 if not prosodyctl.isrunning() then
548 show_message("Prosody is not running"); 548 show_message("Prosody is not running");