diff options
| author | Sadie Powell <sadie@witchery.services> | 2024-09-17 12:32:33 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2024-09-17 12:32:33 +0100 |
| commit | 2ae733bcd15e841fc348b3d78a368f6c684fafb1 (patch) | |
| tree | 8133b0e351f80b2914c00fd5ac092e48a8815375 | |
| parent | 101c68f786fdbdc308a95c65cea19458a5e15850 (diff) | |
| parent | cc37e6d69a6e473814793c0badf14e4f19a23c4f (diff) | |
Merge branch '2.0' into 2.1.
| -rw-r--r-- | data/anope.example.conf | 6 | ||||
| -rw-r--r-- | data/stats.standalone.example.conf | 6 | ||||
| -rw-r--r-- | src/config.cpp | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/data/anope.example.conf b/data/anope.example.conf index 7c2614f53..b6ea60d83 100644 --- a/data/anope.example.conf +++ b/data/anope.example.conf @@ -415,12 +415,6 @@ options readtimeout = 5s /* - * Sets the interval between sending warning messages for program errors via - * WALLOPS/GLOBOPS. - */ - warningtimeout = 4h - - /* * Sets the (maximum) frequency at which the timeout list is checked. This, * combined with readtimeout above, determines how accurately timed events, * such as nick kills, occur; it also determines how much CPU time services diff --git a/data/stats.standalone.example.conf b/data/stats.standalone.example.conf index 4a1c6f644..27af0e182 100644 --- a/data/stats.standalone.example.conf +++ b/data/stats.standalone.example.conf @@ -372,12 +372,6 @@ options readtimeout = 5s /* - * Sets the interval between sending warning messages for program errors via - * WALLOPS/GLOBOPS. - */ - warningtimeout = 4h - - /* * If set, Anope will only show /stats o to IRC Operators. This directive * is optional. */ diff --git a/src/config.cpp b/src/config.cpp index 18dea1b6a..ebf142c04 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -179,7 +179,6 @@ Conf::Conf() : Block("") ValidateNotEmpty("serverinfo", "motd", serverinfo->Get<const Anope::string>("motd")); ValidateNotZero("options", "readtimeout", options->Get<time_t>("readtimeout")); - ValidateNotZero("options", "warningtimeout", options->Get<time_t>("warningtimeout")); ValidateNotZero("networkinfo", "nicklen", networkinfo->Get<unsigned>("nicklen", "1")); ValidateNotZero("networkinfo", "userlen", networkinfo->Get<unsigned>("userlen", "1")); |