Software `/` code `/` prosody

Annotate

prosodyctl @ 11078:fb3aec3dbe21

util.error: Have init() return an object to allow API extensibility via additional methods

author	Matthew Wild <mwild1@gmail.com>
date	Fri, 25 Sep 2020 12:32:43 +0100
parent	11006:8ac958938e0f
child	11133:624eafed3343

rev	line source
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 #!/usr/bin/env lua
1523 841d61be198f Remove version number from copyright headers Matthew Wild <mwild1@gmail.com> parents: 1501 diff changeset	2 -- Prosody IM
3742 a18acd47904b prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3741 diff changeset	3 -- Copyright (C) 2008-2010 Matthew Wild
a18acd47904b prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3741 diff changeset	4 -- Copyright (C) 2008-2010 Waqas Hussain
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	5 --
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	6 -- This project is MIT/X11 licensed. Please see the
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	7 -- COPYING file in the source package for more information.
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	8 --
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	9
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	10 -- prosodyctl - command-line controller for Prosody XMPP server
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	11
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	12 -- Will be modified by configure script if run --
7297 b34a42a10c9f prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308. Matthew Wild <mwild1@gmail.com> parents: 7267 diff changeset	13 CFG_SOURCEDIR=CFG_SOURCEDIR or os.getenv("PROSODY_SRCDIR");
b34a42a10c9f prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308. Matthew Wild <mwild1@gmail.com> parents: 7267 diff changeset	14 CFG_CONFIGDIR=CFG_CONFIGDIR or os.getenv("PROSODY_CFGDIR");
b34a42a10c9f prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308. Matthew Wild <mwild1@gmail.com> parents: 7267 diff changeset	15 CFG_PLUGINDIR=CFG_PLUGINDIR or os.getenv("PROSODY_PLUGINDIR");
b34a42a10c9f prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308. Matthew Wild <mwild1@gmail.com> parents: 7267 diff changeset	16 CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	17
3742 a18acd47904b prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3741 diff changeset	18 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	19
3999 58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	20 local function is_relative(path)
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	21 local path_sep = package.config:sub(1,1);
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	22 return ((path_sep == "/" and path:sub(1,1) ~= "/")
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	23 or (path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\")))
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	24 end
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	25
3742 a18acd47904b prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3741 diff changeset	26 -- Tell Lua where to find our libraries
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	27 if CFG_SOURCEDIR then
3999 58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	28 local function filter_relative_paths(path)
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	29 if is_relative(path) then return ""; end
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	30 end
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	31 local function sanitise_paths(paths)
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	32 return (paths:gsub("[^;]+;?", filter_relative_paths):gsub(";;+", ";"));
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	33 end
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	34 package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path);
58c0de7c6da0 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 3998 diff changeset	35 package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	36 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	37
3742 a18acd47904b prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3741 diff changeset	38 -- Substitute ~ with path to home directory in data path
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	39 if CFG_DATADIR then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	40 if os.getenv("HOME") then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	41 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	42 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	43 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	44
8635 47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	45 -----------
1580 5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	46
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	47 local startup = require "util.startup";
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	48 startup.prosodyctl();
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	49
8635 47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	50 -----------
3339 7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	51
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	52 local configmanager = require "core.configmanager";
5023 dcc8e789df36 mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals Florian Zeitz <florob@babelmonkeys.de> parents: 4881 diff changeset	53 local modulemanager = require "core.modulemanager"
dcc8e789df36 mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals Florian Zeitz <florob@babelmonkeys.de> parents: 4881 diff changeset	54 local prosodyctl = require "util.prosodyctl"
6784 4da860edc27c prosodyctl: Import LuaSocket to a local, don't assume that a global will be set Kim Alvefur <zash@zash.se> parents: 6751 diff changeset	55 local socket = require "socket"
8635 47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	56 local dependencies = require "util.dependencies";
10610 b9a054ad38e7 prosodyctl: Fix some luacheck warnings Matthew Wild <mwild1@gmail.com> parents: 10608 diff changeset	57 local lfs = dependencies.softreq "lfs";
8198 db82ce3decee prosody, prosodyctl: Set up TLS settings for HTTPS requests in net.http (part of fix for #659) Kim Alvefur <zash@zash.se> parents: 8190 diff changeset	58
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	59 -----------------------
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	60
10871 e5dee71d0ebb prosodyctl+util.prosodyctl.: Start breaking up the ever-growing prosodyctl Matthew Wild <mwild1@gmail.com>* parents: 10858 diff changeset	61 local human_io = require "util.human.io";
e5dee71d0ebb prosodyctl+util.prosodyctl.: Start breaking up the ever-growing prosodyctl Matthew Wild <mwild1@gmail.com>* parents: 10858 diff changeset	62
4142 caa78589598f prosodyctl, util.prosodyctl: Move UI functions to util.prosodyctl so they can be used outside of prosodyctl itself Matthew Wild <mwild1@gmail.com> parents: 4095 diff changeset	63 local show_message, show_warning = prosodyctl.show_message, prosodyctl.show_warning;
caa78589598f prosodyctl, util.prosodyctl: Move UI functions to util.prosodyctl so they can be used outside of prosodyctl itself Matthew Wild <mwild1@gmail.com> parents: 4095 diff changeset	64 local show_usage = prosodyctl.show_usage;
10871 e5dee71d0ebb prosodyctl+util.prosodyctl.: Start breaking up the ever-growing prosodyctl Matthew Wild <mwild1@gmail.com>* parents: 10858 diff changeset	65 local read_password = human_io.read_password;
10207 4c755c2e6305 prosodyctl: Install, remove and list commands now use the call_luarocks function João Duarte <jvsDuarte08@gmail.com> parents: 10202 diff changeset	66 local call_luarocks = prosodyctl.call_luarocks;
10871 e5dee71d0ebb prosodyctl+util.prosodyctl.: Start breaking up the ever-growing prosodyctl Matthew Wild <mwild1@gmail.com>* parents: 10858 diff changeset	67 local error_messages = prosodyctl.error_messages;
1459 545208bc0e84 prosodyctl: Use prosodyctl_timeout option if it exists in the config Matthew Wild <mwild1@gmail.com> parents: 1458 diff changeset	68
6324 c9730926002b prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser Matthew Wild <mwild1@gmail.com> parents: 6035 diff changeset	69 local jid_split = require "util.jid".prepped_split;
c9730926002b prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser Matthew Wild <mwild1@gmail.com> parents: 6035 diff changeset	70
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	71 local prosodyctl_timeout = (configmanager.get("", "prosodyctl_timeout") or 5) 2;
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	72 -----------------------
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	73 local commands = {};
9780 c7727c13260f prosodyctl: Pass the original argv table to subcommands (with first argument removed) Kim Alvefur <zash@zash.se> parents: 9709 diff changeset	74 local command = table.remove(arg, 1);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	75
10141 cf70deac27f6 prosodyctl: Added the 'install' command João Duarte <jvsDuarte08@gmail.com> parents: 10140 diff changeset	76 function commands.install(arg)
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	77 if arg[1] == "--help" then
10172 5da519ef2d51 prosodyctl: Corrected the help output of the install and remove commands João Duarte <jvsDuarte08@gmail.com> parents: 10170 diff changeset	78 show_usage([[install]], [[Installs a prosody/luarocks plugin]]);
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	79 return 1;
1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	80 end
10207 4c755c2e6305 prosodyctl: Install, remove and list commands now use the call_luarocks function João Duarte <jvsDuarte08@gmail.com> parents: 10202 diff changeset	81 call_luarocks(arg[1], "install")
10141 cf70deac27f6 prosodyctl: Added the 'install' command João Duarte <jvsDuarte08@gmail.com> parents: 10140 diff changeset	82 end
cf70deac27f6 prosodyctl: Added the 'install' command João Duarte <jvsDuarte08@gmail.com> parents: 10140 diff changeset	83
10161 ea10561e5566 prosodyctl: Corrected the remove and install commands' order João Duarte <jvsDuarte08@gmail.com> parents: 10160 diff changeset	84 function commands.remove(arg)
ea10561e5566 prosodyctl: Corrected the remove and install commands' order João Duarte <jvsDuarte08@gmail.com> parents: 10160 diff changeset	85 if arg[1] == "--help" then
10202 d3764eed7ded prosodyctl: Fixed a typo João Duarte <jvsDuarte08@gmail.com> parents: 10190 diff changeset	86 show_usage([[remove]], [[Removes a module installed in the working directory's plugins folder]]);
10161 ea10561e5566 prosodyctl: Corrected the remove and install commands' order João Duarte <jvsDuarte08@gmail.com> parents: 10160 diff changeset	87 return 1;
ea10561e5566 prosodyctl: Corrected the remove and install commands' order João Duarte <jvsDuarte08@gmail.com> parents: 10160 diff changeset	88 end
10207 4c755c2e6305 prosodyctl: Install, remove and list commands now use the call_luarocks function João Duarte <jvsDuarte08@gmail.com> parents: 10202 diff changeset	89 call_luarocks(arg[1], "remove")
10161 ea10561e5566 prosodyctl: Corrected the remove and install commands' order João Duarte <jvsDuarte08@gmail.com> parents: 10160 diff changeset	90 end
ea10561e5566 prosodyctl: Corrected the remove and install commands' order João Duarte <jvsDuarte08@gmail.com> parents: 10160 diff changeset	91
10126 ad640c2e072e prosodyctl: Implemented the 'list' command, which is a bridge to 'luarocks list' João Duarte <jvsDuarte08@gmail.com> parents: 10125 diff changeset	92 function commands.list(arg)
10147 1a35b3a2b11b prosodyctl: Corrected indentation on my code João Duarte <jvsDuarte08@gmail.com> parents: 10146 diff changeset	93 if arg[1] == "--help" then
10135 3ae2809030dd prosodyctl: added help support to all my functions João Duarte <jvsDuarte08@gmail.com> parents: 10134 diff changeset	94 show_usage([[list]], [[Shows installed rocks]]);
3ae2809030dd prosodyctl: added help support to all my functions João Duarte <jvsDuarte08@gmail.com> parents: 10134 diff changeset	95 return 1;
3ae2809030dd prosodyctl: added help support to all my functions João Duarte <jvsDuarte08@gmail.com> parents: 10134 diff changeset	96 end
10207 4c755c2e6305 prosodyctl: Install, remove and list commands now use the call_luarocks function João Duarte <jvsDuarte08@gmail.com> parents: 10202 diff changeset	97 call_luarocks(arg[1], "list")
10126 ad640c2e072e prosodyctl: Implemented the 'list' command, which is a bridge to 'luarocks list' João Duarte <jvsDuarte08@gmail.com> parents: 10125 diff changeset	98 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	99
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	100 function commands.adduser(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	101 if not arg[1] or arg[1] == "--help" then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	102 show_usage([[adduser JID]], [[Create the specified user account in Prosody]]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	103 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	104 end
6324 c9730926002b prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser Matthew Wild <mwild1@gmail.com> parents: 6035 diff changeset	105 local user, host = jid_split(arg[1]);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	106 if not user and host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	107 show_message [[Failed to understand JID, please supply the JID you want to create]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	108 show_usage [[adduser user@host]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	109 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	110 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	111
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	112 if not host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	113 show_message [[Please specify a JID, including a host. e.g. alice@example.com]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	114 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	115 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	116
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	117 if not prosody.hosts[host] then
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	118 show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	119 show_warning("The user will not be able to log in until this is changed.");
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	120 prosody.hosts[host] = startup.make_host(host); --luacheck: ignore 122
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	121 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	122
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	123 if prosodyctl.user_exists{ user = user, host = host } then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	124 show_message [[That user already exists]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	125 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	126 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	127
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	128 local password = read_password();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	129 if not password then return 1; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	130
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	131 local ok, msg = prosodyctl.adduser { user = user, host = host, password = password };
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	132
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	133 if ok then return 0; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	134
10369 9d20fca6a485 prosodyctl: Print friendly version of error messages Kim Alvefur <zash@zash.se> parents: 10270 diff changeset	135 show_message(error_messages[msg])
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	136 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	137 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	138
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	139 function commands.passwd(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	140 if not arg[1] or arg[1] == "--help" then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	141 show_usage([[passwd JID]], [[Set the password for the specified user account in Prosody]]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	142 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	143 end
5610 f73d5fb4ea13 prosodyctl: Use jid.split() to parse parameter to adduser/deluser/passwd Matthew Wild <mwild1@gmail.com> parents: 5592 diff changeset	144 local user, host = jid_split(arg[1]);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	145 if not user and host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	146 show_message [[Failed to understand JID, please supply the JID you want to set the password for]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	147 show_usage [[passwd user@host]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	148 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	149 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	150
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	151 if not host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	152 show_message [[Please specify a JID, including a host. e.g. alice@example.com]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	153 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	154 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	155
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	156 if not prosody.hosts[host] then
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	157 show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	158 show_warning("The user will not be able to log in until this is changed.");
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	159 prosody.hosts[host] = startup.make_host(host); --luacheck: ignore 122
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	160 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	161
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	162 if not prosodyctl.user_exists { user = user, host = host } then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	163 show_message [[That user does not exist, use prosodyctl adduser to create a new user]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	164 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	165 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	166
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	167 local password = read_password();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	168 if not password then return 1; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	169
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	170 local ok, msg = prosodyctl.passwd { user = user, host = host, password = password };
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	171
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	172 if ok then return 0; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	173
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	174 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	175 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	176 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	177
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	178 function commands.deluser(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	179 if not arg[1] or arg[1] == "--help" then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	180 show_usage([[deluser JID]], [[Permanently remove the specified user account from Prosody]]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	181 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	182 end
6324 c9730926002b prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser Matthew Wild <mwild1@gmail.com> parents: 6035 diff changeset	183 local user, host = jid_split(arg[1]);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	184 if not user and host then
7676 7311dc843718 prosodyctl: Fix copy/paste error in help text for deluser command Matthew Wild <mwild1@gmail.com> parents: 6498 diff changeset	185 show_message [[Failed to understand JID, please supply the JID to the user account you want to delete]]
7311dc843718 prosodyctl: Fix copy/paste error in help text for deluser command Matthew Wild <mwild1@gmail.com> parents: 6498 diff changeset	186 show_usage [[deluser user@host]]
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	187 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	188 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	189
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	190 if not host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	191 show_message [[Please specify a JID, including a host. e.g. alice@example.com]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	192 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	193 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	194
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	195 if not prosody.hosts[host] then
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	196 show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
8718 c23cdeac5b61 prosodyctl: Use prosody.hosts instead of _G.hosts Kim Alvefur <zash@zash.se> parents: 8701 diff changeset	197 prosody.hosts[host] = startup.make_host(host); --luacheck: ignore 122
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	198 end
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	199
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	200 if not prosodyctl.user_exists { user = user, host = host } then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	201 show_message [[That user does not exist on this server]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	202 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	203 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	204
5101 a94c43cad081 prosodyctl: Use util.prosodyctl.deluser Kim Alvefur <zash@zash.se> parents: 5024 diff changeset	205 local ok, msg = prosodyctl.deluser { user = user, host = host };
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	206
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	207 if ok then return 0; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	208
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	209 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	210 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	211 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	212
10610 b9a054ad38e7 prosodyctl: Fix some luacheck warnings Matthew Wild <mwild1@gmail.com> parents: 10608 diff changeset	213 local function service_command_warning(service_command)
10608 87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	214 if prosody.installed and configmanager.get("*", "prosodyctl_service_warnings") ~= false then
87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	215 show_warning("WARNING: Use of prosodyctl start/stop/restart/reload is not recommended");
87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	216 show_warning(" if Prosody is managed by an init system - use that directly instead.");
10610 b9a054ad38e7 prosodyctl: Fix some luacheck warnings Matthew Wild <mwild1@gmail.com> parents: 10608 diff changeset	217 lfs = lfs or require
10608 87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	218 if lfs.attributes("/etc/systemd") then
10610 b9a054ad38e7 prosodyctl: Fix some luacheck warnings Matthew Wild <mwild1@gmail.com> parents: 10608 diff changeset	219 show_warning(" e.g. systemctl %s prosody", service_command);
10608 87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	220 elseif lfs.attributes("/etc/init.d/prosody") then
10610 b9a054ad38e7 prosodyctl: Fix some luacheck warnings Matthew Wild <mwild1@gmail.com> parents: 10608 diff changeset	221 show_warning(" e.g. /etc/init.d/prosody %s", service_command);
10608 87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	222 end
87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	223 show_warning("");
87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	224 end
87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	225 end
87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	226
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	227 function commands.start(arg)
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	228 if arg[1] == "--help" then
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	229 show_usage([[start]], [[Start Prosody]]);
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	230 return 1;
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	231 end
10608 87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	232 service_command_warning("start");
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	233 local ok, ret = prosodyctl.isrunning();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	234 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	235 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	236 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	237 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	238
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	239 if ret then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	240 --luacheck: ignore 421/ret
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	241 local ok, ret = prosodyctl.getpid();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	242 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	243 show_message("Couldn't get running Prosody's PID");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	244 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	245 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	246 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	247 show_message("Prosody is already running with PID %s", ret or "(unknown)");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	248 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	249 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	250
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	251 --luacheck: ignore 411/ret
10064 1acfd25cd507 prosodyctl: Fix extraction of interpreter from arg when additional arguments (fixes #1386) Kim Alvefur <zash@zash.se> parents: 9992 diff changeset	252 local lua;
1acfd25cd507 prosodyctl: Fix extraction of interpreter from arg when additional arguments (fixes #1386) Kim Alvefur <zash@zash.se> parents: 9992 diff changeset	253 do
1acfd25cd507 prosodyctl: Fix extraction of interpreter from arg when additional arguments (fixes #1386) Kim Alvefur <zash@zash.se> parents: 9992 diff changeset	254 local i = 0;
1acfd25cd507 prosodyctl: Fix extraction of interpreter from arg when additional arguments (fixes #1386) Kim Alvefur <zash@zash.se> parents: 9992 diff changeset	255 repeat
1acfd25cd507 prosodyctl: Fix extraction of interpreter from arg when additional arguments (fixes #1386) Kim Alvefur <zash@zash.se> parents: 9992 diff changeset	256 i = i - 1;
1acfd25cd507 prosodyctl: Fix extraction of interpreter from arg when additional arguments (fixes #1386) Kim Alvefur <zash@zash.se> parents: 9992 diff changeset	257 until arg[i-1] == nil
1acfd25cd507 prosodyctl: Fix extraction of interpreter from arg when additional arguments (fixes #1386) Kim Alvefur <zash@zash.se> parents: 9992 diff changeset	258 lua = arg[i];
1acfd25cd507 prosodyctl: Fix extraction of interpreter from arg when additional arguments (fixes #1386) Kim Alvefur <zash@zash.se> parents: 9992 diff changeset	259 end
1acfd25cd507 prosodyctl: Fix extraction of interpreter from arg when additional arguments (fixes #1386) Kim Alvefur <zash@zash.se> parents: 9992 diff changeset	260 local ok, ret = prosodyctl.start(prosody.paths.source, lua);
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	261 if ok then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	262 local daemonize = configmanager.get("*", "daemonize");
6062 6cc6b4d407df prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms Kim Alvefur <zash@zash.se> parents: 6038 diff changeset	263 if daemonize == nil then
6cc6b4d407df prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms Kim Alvefur <zash@zash.se> parents: 6038 diff changeset	264 daemonize = prosody.installed;
6cc6b4d407df prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms Kim Alvefur <zash@zash.se> parents: 6038 diff changeset	265 end
6cc6b4d407df prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms Kim Alvefur <zash@zash.se> parents: 6038 diff changeset	266 if daemonize then
2511 a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	267 local i=1;
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	268 while true do
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	269 local ok, running = prosodyctl.isrunning();
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	270 if ok and running then
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	271 break;
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	272 elseif i == 5 then
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	273 show_message("Still waiting...");
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	274 elseif i >= prosodyctl_timeout then
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	275 show_message("Prosody is still not running. Please give it some time or check your log files for errors.");
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	276 return 2;
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	277 end
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	278 socket.sleep(0.5);
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	279 i = i + 1;
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	280 end
2511 a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	281 show_message("Started");
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	282 end
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	283 return 0;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	284 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	285
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	286 show_message("Failed to start Prosody");
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	287 show_message(error_messages[ret])
2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	288 return 1;
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	289 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	290
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	291 function commands.status(arg)
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	292 if arg[1] == "--help" then
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	293 show_usage([[status]], [[Reports the running status of Prosody]]);
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	294 return 1;
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	295 end
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	296
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	297 local ok, ret = prosodyctl.isrunning();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	298 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	299 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	300 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	301 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	302
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	303 if ret then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	304 --luacheck: ignore 421/ret
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	305 local ok, ret = prosodyctl.getpid();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	306 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	307 show_message("Couldn't get running Prosody's PID");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	308 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	309 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	310 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	311 show_message("Prosody is running with PID %s", ret or "(unknown)");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	312 return 0;
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	313 else
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	314 show_message("Prosody is not running");
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	315 if not prosody.switched_user and prosody.current_uid ~= 0 then
1122 07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	316 print("\nNote:")
07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	317 print(" You will also see this if prosodyctl is not running under");
07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	318 print(" the same user account as Prosody. Try running as root (e.g. ");
07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	319 print(" with 'sudo' in front) to gain access to Prosody's real status.");
1115 8a7bc1a5eae6 prosodyctl: status: Show warning if we can't find a running Prosody, and we didn't switch user Matthew Wild <mwild1@gmail.com> parents: 1114 diff changeset	320 end
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	321 return 2
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	322 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	323 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	324
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	325 function commands.stop(arg)
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	326 if arg[1] == "--help" then
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	327 show_usage([[stop]], [[Stop a running Prosody server]]);
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	328 return 1;
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	329 end
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	330
10608 87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	331 service_command_warning("stop");
87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	332
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	333 if not prosodyctl.isrunning() then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	334 show_message("Prosody is not running");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	335 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	336 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	337
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	338 local ok, ret = prosodyctl.stop();
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	339 if ok then
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	340 local i=1;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	341 while true do
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	342 local ok, running = prosodyctl.isrunning();
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	343 if ok and not running then
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	344 break;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	345 elseif i == 5 then
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	346 show_message("Still waiting...");
1459 545208bc0e84 prosodyctl: Use prosodyctl_timeout option if it exists in the config Matthew Wild <mwild1@gmail.com> parents: 1458 diff changeset	347 elseif i >= prosodyctl_timeout then
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	348 show_message("Prosody is still running. Please give it some time or check your log files for errors.");
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	349 return 2;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	350 end
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	351 socket.sleep(0.5);
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	352 i = i + 1;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	353 end
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	354 show_message("Stopped");
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	355 return 0;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	356 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	357
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	358 show_message(error_messages[ret]);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	359 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	360 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	361
2696 cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	362 function commands.restart(arg)
cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	363 if arg[1] == "--help" then
2705 8a5af6f14c07 prosodyctl: Fix 'restart' command to not report itself as the 'stop' command (thanks albert!) Matthew Wild <mwild1@gmail.com> parents: 2696 diff changeset	364 show_usage([[restart]], [[Restart a running Prosody server]]);
2696 cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	365 return 1;
cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	366 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	367
10608 87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	368 service_command_warning("restart");
87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	369
3724 c12ebbd4ab61 prosodyctl: Make the 'restart' command start Prosody even if it wasn't already running Matthew Wild <mwild1@gmail.com> parents: 3630 diff changeset	370 commands.stop(arg);
c12ebbd4ab61 prosodyctl: Make the 'restart' command start Prosody even if it wasn't already running Matthew Wild <mwild1@gmail.com> parents: 3630 diff changeset	371 return commands.start(arg);
2696 cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	372 end
cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	373
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	374 function commands.about(arg)
4331 9c45858e3208 prosodyctl: Fix 'about' command to not show up where it shouldn't... Matthew Wild <mwild1@gmail.com> parents: 4324 diff changeset	375 if arg[1] == "--help" then
9c45858e3208 prosodyctl: Fix 'about' command to not show up where it shouldn't... Matthew Wild <mwild1@gmail.com> parents: 4324 diff changeset	376 show_usage([[about]], [[Show information about this Prosody installation]]);
9c45858e3208 prosodyctl: Fix 'about' command to not show up where it shouldn't... Matthew Wild <mwild1@gmail.com> parents: 4324 diff changeset	377 return 1;
9c45858e3208 prosodyctl: Fix 'about' command to not show up where it shouldn't... Matthew Wild <mwild1@gmail.com> parents: 4324 diff changeset	378 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	379
6584 c3a56f8847ac prosodyctl: Show relative paths in about Kim Alvefur <zash@zash.se> parents: 6501 diff changeset	380 local pwd = ".";
11002 b0766f2603e9 prosodyctl about: Use library function for sorted listing of lua modules Kim Alvefur <zash@zash.se> parents: 10964 diff changeset	381 local sorted_pairs = require "util.iterators".sorted_pairs;
6587 54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	382 local hg = require"util.mercurial";
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	383 local relpath = configmanager.resolve_relative_path;
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	384
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	385 print("Prosody "..(prosody.version or "(unknown version)"));
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	386 print("");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	387 print("# Prosody directories");
8635 47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	388 print("Data directory: "..relpath(pwd, prosody.paths.data));
47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	389 print("Config directory: "..relpath(pwd, prosody.paths.config or "."));
47e3b8b6f17a prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module Matthew Wild <mwild1@gmail.com> parents: 8561 diff changeset	390 print("Source directory: "..relpath(pwd, prosody.paths.source or "."));
6587 54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	391 print("Plugin directories:")
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	392 print(" "..(prosody.paths.plugins:gsub("([^;]+);?", function(path)
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	393 path = configmanager.resolve_relative_path(pwd, path);
6587 54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	394 local hgid, hgrepo = hg.check_id(path);
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	395 if not hgid and hgrepo then
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	396 return path.." - "..hgrepo .."!\n ";
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	397 end
6611 65dd3770bcb0 prosodyctl: Document magic commit ID Paul Aurich <paul@darkrain42.org> parents: 6587 diff changeset	398 -- 010452cfaf53 is the first commit in the prosody-modules repository
6587 54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	399 hgrepo = hgrepo == "010452cfaf53" and "prosody-modules";
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	400 return path..(hgid and " - "..(hgrepo or "HG").." rev: "..hgid or "")
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	401 .."\n ";
54306208f30b prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts Kim Alvefur <zash@zash.se> parents: 6586 diff changeset	402 end)));
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	403 print("");
9826 bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	404 local have_pposix, pposix = pcall(require, "util.pposix");
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	405 if have_pposix and pposix.uname then
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	406 print("# Operating system");
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	407 local uname, err = pposix.uname();
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	408 print(uname and uname.sysname .. " " .. uname.release or "Unknown POSIX", err or "");
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	409 print("");
bdc2a024933b prosodyctl: about: Report the current operating system according to uname Kim Alvefur <zash@zash.se> parents: 9798 diff changeset	410 end
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	411 print("# Lua environment");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	412 print("Lua version: ", _G._VERSION);
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	413 print("");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	414 print("Lua module search paths:");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	415 for path in package.path:gmatch("[^;]+") do
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	416 print(" "..path);
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	417 end
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	418 print("");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	419 print("Lua C module search paths:");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	420 for path in package.cpath:gmatch("[^;]+") do
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	421 print(" "..path);
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	422 end
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	423 print("");
8701 b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	424 local luarocks_status = "Not installed"
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	425 if pcall(require, "luarocks.loader") then
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	426 luarocks_status = "Installed (2.x+)";
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	427 if package.loaded["luarocks.cfg"] then
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	428 luarocks_status = "Installed ("..(package.loaded["luarocks.cfg"].program_version or "2.x+")..")";
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	429 end
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	430 elseif pcall(require, "luarocks.require") then
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	431 luarocks_status = "Installed (1.x)";
b7a22baaf55f prosodyctl: Increase robustness in luarocks version detection (fixes #1003) Kim Alvefur <zash@zash.se> parents: 8671 diff changeset	432 end
4333 040193dead77 prosodyctl: Add info about the presence of LuaRocks to 'about' command Matthew Wild <mwild1@gmail.com> parents: 4331 diff changeset	433 print("LuaRocks: ", luarocks_status);
040193dead77 prosodyctl: Add info about the presence of LuaRocks to 'about' command Matthew Wild <mwild1@gmail.com> parents: 4331 diff changeset	434 print("");
9856 4be2af104bf0 prosodyctl about: Report network backend in use Matthew Wild <mwild1@gmail.com> parents: 9709 diff changeset	435 print("# Network");
4be2af104bf0 prosodyctl about: Report network backend in use Matthew Wild <mwild1@gmail.com> parents: 9709 diff changeset	436 print("");
4be2af104bf0 prosodyctl about: Report network backend in use Matthew Wild <mwild1@gmail.com> parents: 9709 diff changeset	437 print("Backend: "..require "net.server".get_backend());
4be2af104bf0 prosodyctl about: Report network backend in use Matthew Wild <mwild1@gmail.com> parents: 9709 diff changeset	438 print("");
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	439 print("# Lua module versions");
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	440 local module_versions, longest_name = {}, 8;
11003 c82ede8892fc prosodyctl about: Split out libraries into a separate section Kim Alvefur <zash@zash.se> parents: 11002 diff changeset	441 local library_versions = {};
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	442 dependencies.softreq"ssl";
9991 8cd180dc18a8 prosodyctl: Include version of LuaDBI in 'about' Kim Alvefur <zash@zash.se> parents: 9856 diff changeset	443 dependencies.softreq"DBI";
11004 d175de07dd73 prosodyctl about: Substitute better names for some Lua modules Kim Alvefur <zash@zash.se> parents: 11003 diff changeset	444 local friendly_names = {
d175de07dd73 prosodyctl about: Substitute better names for some Lua modules Kim Alvefur <zash@zash.se> parents: 11003 diff changeset	445 DBI = "LuaDBI";
d175de07dd73 prosodyctl about: Substitute better names for some Lua modules Kim Alvefur <zash@zash.se> parents: 11003 diff changeset	446 lfs = "LuaFileSystem";
d175de07dd73 prosodyctl about: Substitute better names for some Lua modules Kim Alvefur <zash@zash.se> parents: 11003 diff changeset	447 lunbound = "luaunbound";
d175de07dd73 prosodyctl about: Substitute better names for some Lua modules Kim Alvefur <zash@zash.se> parents: 11003 diff changeset	448 lxp = "LuaExpat";
d175de07dd73 prosodyctl about: Substitute better names for some Lua modules Kim Alvefur <zash@zash.se> parents: 11003 diff changeset	449 socket = "LuaSocket";
d175de07dd73 prosodyctl about: Substitute better names for some Lua modules Kim Alvefur <zash@zash.se> parents: 11003 diff changeset	450 ssl = "LuaSec";
d175de07dd73 prosodyctl about: Substitute better names for some Lua modules Kim Alvefur <zash@zash.se> parents: 11003 diff changeset	451 };
10964 d6a3d652ca32 prosodyctl about: Report versions of luaunbound and libunbound Kim Alvefur <zash@zash.se> parents: 10905 diff changeset	452 local lunbound = dependencies.softreq"lunbound";
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	453 for name, module in pairs(package.loaded) do
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	454 if type(module) == "table" and rawget(module, "_VERSION")
11004 d175de07dd73 prosodyctl about: Substitute better names for some Lua modules Kim Alvefur <zash@zash.se> parents: 11003 diff changeset	455 and name ~= "_G" and not name:match("%.") then
d175de07dd73 prosodyctl about: Substitute better names for some Lua modules Kim Alvefur <zash@zash.se> parents: 11003 diff changeset	456 name = friendly_names[name] or name;
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	457 if #name > longest_name then
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	458 longest_name = #name;
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	459 end
11005 cff243aafdce prosodyctl about: Strip name from lua module _VERSION Kim Alvefur <zash@zash.se> parents: 11004 diff changeset	460 local mod_version = module._VERSION;
cff243aafdce prosodyctl about: Strip name from lua module _VERSION Kim Alvefur <zash@zash.se> parents: 11004 diff changeset	461 if tostring(mod_version):sub(1, #name+1) == name .. " " then
cff243aafdce prosodyctl about: Strip name from lua module _VERSION Kim Alvefur <zash@zash.se> parents: 11004 diff changeset	462 mod_version = mod_version:sub(#name+2);
cff243aafdce prosodyctl about: Strip name from lua module _VERSION Kim Alvefur <zash@zash.se> parents: 11004 diff changeset	463 end
cff243aafdce prosodyctl about: Strip name from lua module _VERSION Kim Alvefur <zash@zash.se> parents: 11004 diff changeset	464 module_versions[name] = mod_version;
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	465 end
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	466 end
10964 d6a3d652ca32 prosodyctl about: Report versions of luaunbound and libunbound Kim Alvefur <zash@zash.se> parents: 10905 diff changeset	467 if lunbound then
11006 8ac958938e0f prosodyctl about: Show longer name for luaunbound Kim Alvefur <zash@zash.se> parents: 11005 diff changeset	468 if not module_versions["luaunbound"] then
8ac958938e0f prosodyctl about: Show longer name for luaunbound Kim Alvefur <zash@zash.se> parents: 11005 diff changeset	469 module_versions["luaunbound"] = "0.5 (?)";
10964 d6a3d652ca32 prosodyctl about: Report versions of luaunbound and libunbound Kim Alvefur <zash@zash.se> parents: 10905 diff changeset	470 end
11003 c82ede8892fc prosodyctl about: Split out libraries into a separate section Kim Alvefur <zash@zash.se> parents: 11002 diff changeset	471 library_versions["libunbound"] = lunbound._LIBVER;
10964 d6a3d652ca32 prosodyctl about: Report versions of luaunbound and libunbound Kim Alvefur <zash@zash.se> parents: 10905 diff changeset	472 end
11002 b0766f2603e9 prosodyctl about: Use library function for sorted listing of lua modules Kim Alvefur <zash@zash.se> parents: 10964 diff changeset	473 for name, version in sorted_pairs(module_versions) do
b0766f2603e9 prosodyctl about: Use library function for sorted listing of lua modules Kim Alvefur <zash@zash.se> parents: 10964 diff changeset	474 print(name..":"..string.rep(" ", longest_name-#name), version);
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	475 end
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	476 print("");
11003 c82ede8892fc prosodyctl about: Split out libraries into a separate section Kim Alvefur <zash@zash.se> parents: 11002 diff changeset	477 print("# library versions");
c82ede8892fc prosodyctl about: Split out libraries into a separate section Kim Alvefur <zash@zash.se> parents: 11002 diff changeset	478 if require "net.server".event_base then
c82ede8892fc prosodyctl about: Split out libraries into a separate section Kim Alvefur <zash@zash.se> parents: 11002 diff changeset	479 library_versions["libevent"] = require"luaevent".core.libevent_version();
c82ede8892fc prosodyctl about: Split out libraries into a separate section Kim Alvefur <zash@zash.se> parents: 11002 diff changeset	480 end
c82ede8892fc prosodyctl about: Split out libraries into a separate section Kim Alvefur <zash@zash.se> parents: 11002 diff changeset	481 for name, version in sorted_pairs(library_versions) do
c82ede8892fc prosodyctl about: Split out libraries into a separate section Kim Alvefur <zash@zash.se> parents: 11002 diff changeset	482 print(name..":"..string.rep(" ", longest_name-#name), version);
c82ede8892fc prosodyctl about: Split out libraries into a separate section Kim Alvefur <zash@zash.se> parents: 11002 diff changeset	483 end
c82ede8892fc prosodyctl about: Split out libraries into a separate section Kim Alvefur <zash@zash.se> parents: 11002 diff changeset	484 print("");
4324 5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	485 end
5e7cba840409 prosodyctl: Add 'about' command to list Prosody version, directories, and various other stuff Matthew Wild <mwild1@gmail.com> parents: 4167 diff changeset	486
4335 3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	487 function commands.reload(arg)
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	488 if arg[1] == "--help" then
4476 53ce21286b8c prosodyctl: Adjust description of 'reload' command (thanks crocket) Matthew Wild <mwild1@gmail.com> parents: 4336 diff changeset	489 show_usage([[reload]], [[Reload Prosody's configuration and re-open log files]]);
4335 3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	490 return 1;
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	491 end
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	492
10608 87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	493 service_command_warning("reload");
87003b937672 Log warning when using prosodyctl start/stop/restart Matthew Wild <mwild1@gmail.com> parents: 10578 diff changeset	494
4335 3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	495 if not prosodyctl.isrunning() then
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	496 show_message("Prosody is not running");
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	497 return 1;
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	498 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	499
4335 3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	500 local ok, ret = prosodyctl.reload();
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	501 if ok then
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	502
4336 abcbcb15205c prosodyctl: Update message on reload success Matthew Wild <mwild1@gmail.com> parents: 4335 diff changeset	503 show_message("Prosody log files re-opened and config file reloaded. You may need to reload modules for some changes to take effect.");
4335 3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	504 return 0;
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	505 end
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	506
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	507 show_message(error_messages[ret]);
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	508 return 1;
3a2a01432b5c Add "reload" command to prosodyctl Vladimir Protasov <eoranged@ya.ru> parents: 4334 diff changeset	509 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	510 -- ejabberdctl compatibility
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	511
7920 1db51061342b prosodyctl: Handle move of 'unpack' in Lua 5.2 Kim Alvefur <zash@zash.se> parents: 7679 diff changeset	512 local unpack = table.unpack or unpack; -- luacheck: ignore 113
1db51061342b prosodyctl: Handle move of 'unpack' in Lua 5.2 Kim Alvefur <zash@zash.se> parents: 7679 diff changeset	513
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	514 function commands.register(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	515 local user, host, password = unpack(arg);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	516 if (not (user and host)) or arg[1] == "--help" then
1102 c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	517 if user ~= "--help" then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	518 if not user then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	519 show_message [[No username specified]]
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	520 elseif not host then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	521 show_message [[Please specify which host you want to register the user on]];
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	522 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	523 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	524 show_usage("register USER HOST [PASSWORD]", "Register a user on the server, with the given password");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	525 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	526 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	527 if not password then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	528 password = read_password();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	529 if not password then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	530 show_message [[Unable to register user with no password]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	531 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	532 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	533 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	534
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	535 local ok, msg = prosodyctl.adduser { user = user, host = host, password = password };
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	536
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	537 if ok then return 0; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	538
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	539 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	540 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	541 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	542
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	543 function commands.unregister(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	544 local user, host = unpack(arg);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	545 if (not (user and host)) or arg[1] == "--help" then
1102 c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	546 if user ~= "--help" then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	547 if not user then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	548 show_message [[No username specified]]
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	549 elseif not host then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	550 show_message [[Please specify which host you want to unregister the user from]];
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	551 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	552 end
1102 c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	553 show_usage("unregister USER HOST [PASSWORD]", "Permanently remove a user account from the server");
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	554 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	555 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	556
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	557 local ok, msg = prosodyctl.deluser { user = user, host = host };
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	558
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	559 if ok then return 0; end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	560
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	561 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	562 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	563 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	564
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	565 ---------------------
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	566
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	567 local async = require "util.async";
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	568 local server = require "net.server";
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	569 local watchers = {
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	570 error = function (_, err)
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	571 error(err);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	572 end;
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	573 waiting = function ()
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	574 server.loop();
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	575 end;
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	576 };
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	577 local command_runner = async.runner(function ()
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	578 if command and command:match("^mod_") then -- Is a command in a module
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	579 local module_name = command:match("^mod_(.+)");
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	580 do
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	581 local ret, err = modulemanager.load("*", module_name);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	582 if not ret then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	583 show_message("Failed to load module '"..module_name.."': "..err);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	584 os.exit(1);
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	585 end
1390 ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	586 end
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	587
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	588 local module = modulemanager.get_module("*", module_name);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	589 if not module then
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	590 show_message("Failed to load module '"..module_name.."': Unknown error");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	591 os.exit(1);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	592 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	593
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	594 if not modulemanager.module_has_method(module, "command") then
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	595 show_message("Fail: mod_"..module_name.." does not support any commands");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	596 os.exit(1);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	597 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	598
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	599 local ok, ret = modulemanager.call_module_method(module, "command", arg);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	600 if ok then
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	601 if type(ret) == "number" then
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	602 os.exit(ret);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	603 elseif type(ret) == "string" then
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	604 show_message(ret);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	605 end
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	606 os.exit(0); -- :)
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	607 else
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	608 show_message("Failed to execute command: "..error_messages[ret]);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	609 os.exit(1); -- :(
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	610 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	611 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	612
10905 709255e332d8 prosodyctl: Fix traceback when no command provided (thanks Zash) Matthew Wild <mwild1@gmail.com> parents: 10871 diff changeset	613 if command and not commands[command] then
10871 e5dee71d0ebb prosodyctl+util.prosodyctl.: Start breaking up the ever-growing prosodyctl Matthew Wild <mwild1@gmail.com>* parents: 10858 diff changeset	614 local ok, command_module = pcall(require, "util.prosodyctl."..command);
e5dee71d0ebb prosodyctl+util.prosodyctl.: Start breaking up the ever-growing prosodyctl Matthew Wild <mwild1@gmail.com>* parents: 10858 diff changeset	615 if ok and command_module[command] then
e5dee71d0ebb prosodyctl+util.prosodyctl.: Start breaking up the ever-growing prosodyctl Matthew Wild <mwild1@gmail.com>* parents: 10858 diff changeset	616 commands[command] = command_module[command];
e5dee71d0ebb prosodyctl+util.prosodyctl.: Start breaking up the ever-growing prosodyctl Matthew Wild <mwild1@gmail.com>* parents: 10858 diff changeset	617 end
e5dee71d0ebb prosodyctl+util.prosodyctl.: Start breaking up the ever-growing prosodyctl Matthew Wild <mwild1@gmail.com>* parents: 10858 diff changeset	618 end
e5dee71d0ebb prosodyctl+util.prosodyctl.: Start breaking up the ever-growing prosodyctl Matthew Wild <mwild1@gmail.com>* parents: 10858 diff changeset	619
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	620 if not commands[command] then -- Show help for all commands
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	621 function show_usage(usage, desc)
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	622 print(" "..usage);
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	623 print(" "..desc);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	624 end
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	625
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	626 print("prosodyctl - Manage a Prosody server");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	627 print("");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	628 print("Usage: "..arg[0].." COMMAND [OPTIONS]");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	629 print("");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	630 print("Where COMMAND may be one of:\n");
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	631
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	632 local hidden_commands = require "util.set".new{ "register", "unregister", "addplugin" };
10190 f506964a1123 prosodyctl: Removed the auxiliary command 'enabled_plugins' João Duarte <jvsDuarte08@gmail.com> parents: 10188 diff changeset	633 local commands_order = { "install", "remove", "list", "adduser", "passwd", "deluser", "start", "stop", "restart", "reload",
10170 882ca2f965d5 prosodyctl: Removed the list duplicate at the commands_order variable João Duarte <jvsDuarte08@gmail.com> parents: 10169 diff changeset	634 "about" };
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	635
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	636 local done = {};
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	637
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	638 for _, command_name in ipairs(commands_order) do
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	639 local command_func = commands[command_name];
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	640 if command_func then
a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	641 command_func{ "--help" };
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	642 print""
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	643 done[command_name] = true;
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	644 end
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	645 end
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	646
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	647 for command_name, command_func in pairs(commands) do
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	648 if not done[command_name] and not hidden_commands:contains(command_name) then
8671 a4899174a894 prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixes Matthew Wild <mwild1@gmail.com> parents: 8668 diff changeset	649 command_func{ "--help" };
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	650 print""
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	651 done[command_name] = true;
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	652 end
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	653 end
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	654
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	655
03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	656 os.exit(0);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	657 end
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	658
9780 c7727c13260f prosodyctl: Pass the original argv table to subcommands (with first argument removed) Kim Alvefur <zash@zash.se> parents: 9709 diff changeset	659 os.exit(commands[command](arg));
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	660 end, watchers);
7922 2fd20f372cb1 prosodyctl: Trim trailing whitespace Kim Alvefur <zash@zash.se> parents: 7920 diff changeset	661
8652 03bb534593cb prosodyctl: Run commands inside async context Matthew Wild <mwild1@gmail.com> parents: 8635 diff changeset	662 command_runner:run(true);

prosody

fb3aec3dbe21

prosodyctl

Software / code / prosody

Annotate

prosodyctl @ 11078:fb3aec3dbe21

Software `/` code `/` prosody