Changeset 259707 in webkit

Timestamp:

Apr 8, 2020 1:40:19 AM (4 years ago)

Author:

Philippe Normand

Message:

[GTK][WPE] Release logs are unconditionally filling the journal
​https://bugs.webkit.org/show_bug.cgi?id=209421

Reviewed by Carlos Alberto Lopez Perez.

.:

Re-enable Systemd logging and make it opt-in via the WEBKIT_DEBUG environment variable.

• Source/cmake/OptionsGTK.cmake:
• Source/cmake/OptionsWPE.cmake:

Source/WebCore:

• platform/unix/LoggingUnix.cpp:

(WebCore::logLevelString): Disable all logging when the
WEBKIT_DEBUG environment variable is empty.

Source/WTF:

• wtf/Assertions.h: Don't send logs to systemd for disabled log channels.
• wtf/Logger.h:

(WTF::Logger::willLog const): Ditto.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/Assertions.h (modified) (1 diff)
• Source/WTF/wtf/Logger.h (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/unix/LoggingUnix.cpp (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)
• Source/cmake/OptionsWPE.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2020-04-08  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK][WPE] Release logs are unconditionally filling the journal
+        https://bugs.webkit.org/show_bug.cgi?id=209421
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Re-enable Systemd logging and make it opt-in via the WEBKIT_DEBUG environment variable.
+
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsWPE.cmake:
+
 2020-04-07  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-04-08  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK][WPE] Release logs are unconditionally filling the journal
+        https://bugs.webkit.org/show_bug.cgi?id=209421
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * wtf/Assertions.h: Don't send logs to systemd for disabled log channels.
+        * wtf/Logger.h:
+        (WTF::Logger::willLog const): Ditto.
+
 2020-04-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WTF/wtf/Assertions.h

@@ -542 +542 @@
 #if USE(JOURNALD) && !RELEASE_LOG_DISABLED
 #define PUBLIC_LOG_STRING "s"
-#define SD_JOURNAL_SEND(channel, priority, file, line, function, ...) sd_journal_send_with_location("CODE_FILE=" file, "CODE_LINE=" line, function, "WEBKIT_SUBSYSTEM=%s", LOG_CHANNEL(channel).subsystem, "WEBKIT_CHANNEL=%s", LOG_CHANNEL(channel).name, "PRIORITY=%i", priority, "MESSAGE=" __VA_ARGS__, nullptr)
+#define SD_JOURNAL_SEND(channel, priority, file, line, function, ...) do { \
+    if (LOG_CHANNEL(channel).state != WTFLogChannelState::Off) \
+        sd_journal_send_with_location("CODE_FILE=" file, "CODE_LINE=" line, function, "WEBKIT_SUBSYSTEM=%s", LOG_CHANNEL(channel).subsystem, "WEBKIT_CHANNEL=%s", LOG_CHANNEL(channel).name, "PRIORITY=%i", priority, "MESSAGE=" __VA_ARGS__, nullptr); \
+} while (0)
 
 #define _XSTRINGIFY(line) #line

trunk/Source/WTF/wtf/Logger.h

@@ -239 +239 @@
             return false;
 
+#if USE(SYSTEMD)
+        if (channel.state == WTFLogChannelState::Off)
+            return false;
+#endif
+
         if (level <= WTFLogLevel::Error)
             return true;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-08  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK][WPE] Release logs are unconditionally filling the journal
+        https://bugs.webkit.org/show_bug.cgi?id=209421
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * platform/unix/LoggingUnix.cpp:
+        (WebCore::logLevelString): Disable all logging when the
+        WEBKIT_DEBUG environment variable is empty.
+
 2020-04-07  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/platform/unix/LoggingUnix.cpp

@@ -33 +33 @@
 {
     char* logEnv = getenv("WEBKIT_DEBUG");
+
+    // Disable all log channels if WEBKIT_DEBUG is unset.
     if (!logEnv)
-        return emptyString();
+        return makeString("-all"_s);
 
     // We set up the logs anyway because some of our logging, such as Soup's is available in release builds.

trunk/Source/cmake/OptionsGTK.cmake

@@ -92 +92 @@
 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(USE_WPE_RENDERER "Whether to enable WPE rendering" PUBLIC ON)
-WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC OFF)
+WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC ON)
 
 # Private options specific to the GTK port. Changing these options is

trunk/Source/cmake/OptionsWPE.cmake

@@ -80 +80 @@
 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC OFF)
-WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC OFF)
+WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC ON)
 
 # Private options specific to the WPE port.