LogInit: rename "secure" to "info"

Calling this "secure" never made sense. Messages about client connects are just a small part of what gets logged as "secure", a.k.a. "info".

LogInit: rename "secure" to "info"
3e0ceb12 · Max Kellermann · 050adf66 · 3e0ceb12 · 3e0ceb12
Commit 3e0ceb12 authored Sep 23, 2020 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

mpd.conf.5.rst doc/mpd.conf.5.rst +1 -1

LogInit.cxx src/LogInit.cxx +4 -4

No files found.
--- a/doc/mpd.conf.5.rst
+++ b/doc/mpd.conf.5.rst
@@ -82,7 +82,7 @@ log_level <default, secure, or verbose>
   log levels are available:

   - :samp:`default`: interesting informational messages
-   - :samp:`secure`: unimportant informational messages
+   - :samp:`info`: unimportant informational messages
   - :samp:`verbose`: debug messages (for developers and for
     troubleshooting)


--- a/src/LogInit.cxx
+++ b/src/LogInit.cxx
@@ -42,8 +42,6 @@
 #include <stdio.h>
 #include <unistd.h>

-#define LOG_LEVEL_SECURE LogLevel::INFO
-
 #define LOG_DATE_BUF_SIZE 16
 #define LOG_DATE_LEN (LOG_DATE_BUF_SIZE - 1)

@@ -99,8 +97,10 @@ parse_log_level(const char *value)
 {
 	if (StringIsEqual(value, "default"))
 		return LogLevel::DEFAULT;
-	if (StringIsEqual(value, "secure"))
-		return LOG_LEVEL_SECURE;
+	else if (StringIsEqual(value, "info") ||
+		 /* deprecated since MPD 0.22: */
+		 StringIsEqual(value, "secure"))
+		return LogLevel::INFO;
 	else if (StringIsEqual(value, "verbose"))
 		return LogLevel::DEBUG;
 	else