mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.11->trunk

Browse source
This commit is contained in:
Matthew Wild 2020-01-23 21:44:42 +00:00
commit 79d8e994a2
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
prosodyctl
View file

@ -222,11 +222,25 @@ function commands.deluser(arg)
return 1;
end
local function service_command_warning(command)
if prosody.installed and configmanager.get("*", "prosodyctl_service_warnings") ~= false then
show_warning("WARNING: Use of prosodyctl start/stop/restart/reload is not recommended");
show_warning(" if Prosody is managed by an init system - use that directly instead.");
if lfs.attributes("/etc/systemd") then
show_warning(" e.g. systemctl %s prosody", command);
elseif lfs.attributes("/etc/init.d/prosody") then
show_warning(" e.g. /etc/init.d/prosody %s", command);
end
show_warning("");
end
end
function commands.start(arg)
if arg[1] == "--help" then
show_usage([[start]], [[Start Prosody]]);
return 1;
end
service_command_warning("start");
local ok, ret = prosodyctl.isrunning();
if not ok then
show_message(error_messages[ret]);
@ -325,6 +339,8 @@ function commands.stop(arg)
return 1;
end
service_command_warning("stop");
if not prosodyctl.isrunning() then
show_message("Prosody is not running");
return 1;
@ -360,6 +376,8 @@ function commands.restart(arg)
return 1;
end
service_command_warning("restart");
commands.stop(arg);
return commands.start(arg);
end
@ -460,6 +478,8 @@ function commands.reload(arg)
return 1;
end
service_command_warning("reload");
if not prosodyctl.isrunning() then
show_message("Prosody is not running");
return 1;