From d0026b7941a96407487398d32fafb0171ad34906 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 30 Sep 2021 17:47:00 +0200 Subject: util.startup: Allow separate command line argument settings for prosody and prosodyctl Makes it clearer that prosody does not take -v atm, as well as how prosodyctl does not take the demonization flags. --- util/startup.lua | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'util/startup.lua') diff --git a/util/startup.lua b/util/startup.lua index 9d0253bc..669e3124 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -22,14 +22,19 @@ local default_gc_params = { minor_threshold = 20, major_threshold = 50; }; -local short_params = { D = "daemonize", F = "no-daemonize", v = "verbose" }; -local value_params = { config = true }; +local arg_settigs = { + prosody = { + short_params = { D = "daemonize"; F = "no-daemonize" }; + value_params = { config = true }; + }; + prosodyctl = { + short_params = { v = "verbose" }; + value_params = { config = true }; + }; +} function startup.parse_args() - local opts, err, where = parse_args(arg, { - short_params = short_params, - value_params = value_params, - }); + local opts, err, where = parse_args(arg, arg_settigs[prosody.process_type]); if not opts then if err == "param-not-found" then print("Unknown command-line option: "..tostring(where)); -- cgit v1.2.3