Diff
Modified: trunk/ChangeLog (259706 => 259707)
--- trunk/ChangeLog 2020-04-08 07:46:26 UTC (rev 259706)
+++ trunk/ChangeLog 2020-04-08 08:40:19 UTC (rev 259707)
@@ -1,3 +1,15 @@
+2020-04-08 Philippe Normand <[email protected]>
+
+ [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 <[email protected]>
[GTK] CMake find module for GTK4
Modified: trunk/Source/WTF/ChangeLog (259706 => 259707)
--- trunk/Source/WTF/ChangeLog 2020-04-08 07:46:26 UTC (rev 259706)
+++ trunk/Source/WTF/ChangeLog 2020-04-08 08:40:19 UTC (rev 259707)
@@ -1,3 +1,14 @@
+2020-04-08 Philippe Normand <[email protected]>
+
+ [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 <[email protected]>
Merge DependencyAssertion into ProcessAssertion
Modified: trunk/Source/WTF/wtf/Assertions.h (259706 => 259707)
--- trunk/Source/WTF/wtf/Assertions.h 2020-04-08 07:46:26 UTC (rev 259706)
+++ trunk/Source/WTF/wtf/Assertions.h 2020-04-08 08:40:19 UTC (rev 259707)
@@ -541,7 +541,10 @@
#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
#define _STRINGIFY(line) _XSTRINGIFY(line)
Modified: trunk/Source/WTF/wtf/Logger.h (259706 => 259707)
--- trunk/Source/WTF/wtf/Logger.h 2020-04-08 07:46:26 UTC (rev 259706)
+++ trunk/Source/WTF/wtf/Logger.h 2020-04-08 08:40:19 UTC (rev 259707)
@@ -238,6 +238,11 @@
if (!m_enabled)
return false;
+#if USE(SYSTEMD)
+ if (channel.state == WTFLogChannelState::Off)
+ return false;
+#endif
+
if (level <= WTFLogLevel::Error)
return true;
Modified: trunk/Source/WebCore/ChangeLog (259706 => 259707)
--- trunk/Source/WebCore/ChangeLog 2020-04-08 07:46:26 UTC (rev 259706)
+++ trunk/Source/WebCore/ChangeLog 2020-04-08 08:40:19 UTC (rev 259707)
@@ -1,3 +1,14 @@
+2020-04-08 Philippe Normand <[email protected]>
+
+ [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 <[email protected]>
[iPadOS] Unable to toggle subpages on sites.google.com
Modified: trunk/Source/WebCore/platform/unix/LoggingUnix.cpp (259706 => 259707)
--- trunk/Source/WebCore/platform/unix/LoggingUnix.cpp 2020-04-08 07:46:26 UTC (rev 259706)
+++ trunk/Source/WebCore/platform/unix/LoggingUnix.cpp 2020-04-08 08:40:19 UTC (rev 259707)
@@ -32,8 +32,10 @@
String logLevelString()
{
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.
#if defined(NDEBUG) && RELEASE_LOG_DISABLED
Modified: trunk/Source/cmake/OptionsGTK.cmake (259706 => 259707)
--- trunk/Source/cmake/OptionsGTK.cmake 2020-04-08 07:46:26 UTC (rev 259706)
+++ trunk/Source/cmake/OptionsGTK.cmake 2020-04-08 08:40:19 UTC (rev 259707)
@@ -91,7 +91,7 @@
WEBKIT_OPTION_DEFINE(USE_OPENJPEG "Whether to enable support for JPEG2000 images." PUBLIC ON)
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
# completely unsupported. They are intended for use only by WebKit developers.
Modified: trunk/Source/cmake/OptionsWPE.cmake (259706 => 259707)
--- trunk/Source/cmake/OptionsWPE.cmake 2020-04-08 07:46:26 UTC (rev 259706)
+++ trunk/Source/cmake/OptionsWPE.cmake 2020-04-08 08:40:19 UTC (rev 259707)
@@ -79,7 +79,7 @@
WEBKIT_OPTION_DEFINE(USE_OPENJPEG "Whether to enable support for JPEG2000 images." PUBLIC ON)
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.
WEBKIT_OPTION_DEFINE(USE_GSTREAMER_HOLEPUNCH "Whether to enable GStreamer holepunch" PRIVATE OFF)
