Comparison

util/prosodyctl/check.lua @ 11587:ce7c52a6d650

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 27 May 2021 12:51:07 +0200
parent 11560:3bbb1af92514
child 11612:bc43731b275a
comparison
equal deleted inserted replaced
11585:057ce005937e 11587:ce7c52a6d650
45 local known_global_options = set.new({ 45 local known_global_options = set.new({
46 "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize", 46 "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
47 "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings", 47 "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings",
48 "network_backend", "http_default_host", 48 "network_backend", "http_default_host",
49 "statistics_interval", "statistics", "statistics_config", 49 "statistics_interval", "statistics", "statistics_config",
50 "plugin_server", "installer_plugin_path", "gc" 50 "plugin_server", "installer_plugin_path", "gc", "limits",
51 }); 51 });
52 local config = configmanager.getconfig(); 52 local config = configmanager.getconfig();
53 -- Check that we have any global options (caused by putting a host at the top) 53 -- Check that we have any global options (caused by putting a host at the top)
54 if it.count(it.filter("log", pairs(config["*"]))) == 0 then 54 if it.count(it.filter("log", pairs(config["*"]))) == 0 then
55 ok = false; 55 ok = false;