Title: [137337] trunk/Source/WebCore
Revision
137337
Author
[email protected]
Date
2012-12-11 10:58:19 -0800 (Tue, 11 Dec 2012)

Log Message

[GTK] Soup network logs are frequently interrupted by other logging messages
https://bugs.webkit.org/show_bug.cgi?id=104668

Patch by Jonathon Jongsma <[email protected]> on 2012-12-11
Reviewed by Martin Robinson.

Set an external soup log printer that uses the WebKit logging
infrastructure so that log messages are properly synchronized.

* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::soupLogPrinter):
(WebCore):
(WebCore::ensureSessionIsInitialized):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (137336 => 137337)


--- trunk/Source/WebCore/ChangeLog	2012-12-11 18:53:19 UTC (rev 137336)
+++ trunk/Source/WebCore/ChangeLog	2012-12-11 18:58:19 UTC (rev 137337)
@@ -1,3 +1,18 @@
+2012-12-11  Jonathon Jongsma  <[email protected]>
+
+        [GTK] Soup network logs are frequently interrupted by other logging messages
+        https://bugs.webkit.org/show_bug.cgi?id=104668
+
+        Reviewed by Martin Robinson.
+
+        Set an external soup log printer that uses the WebKit logging
+        infrastructure so that log messages are properly synchronized.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::soupLogPrinter):
+        (WebCore):
+        (WebCore::ensureSessionIsInitialized):
+
 2012-12-11  Elliott Sprehn  <[email protected]>
 
         Switch to new PseudoElement based :before and :after

Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (137336 => 137337)


--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp	2012-12-11 18:53:19 UTC (rev 137336)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp	2012-12-11 18:58:19 UTC (rev 137337)
@@ -79,6 +79,11 @@
 
 #define READ_BUFFER_SIZE 8192
 
+inline static void soupLogPrinter(SoupLogger* logger, SoupLoggerLogLevel, char direction, const char* data, gpointer)
+{
+    LOG(Network, "%c %s", direction, data);
+}
+
 static bool loadingSynchronousRequest = false;
 
 class WebCoreSynchronousLoader : public ResourceHandleClient {
@@ -266,6 +271,7 @@
     if (!soup_session_get_feature(session, SOUP_TYPE_LOGGER) && LogNetwork.state == WTFLogChannelOn) {
         SoupLogger* logger = soup_logger_new(static_cast<SoupLoggerLogLevel>(SOUP_LOGGER_LOG_BODY), -1);
         soup_session_add_feature(session, SOUP_SESSION_FEATURE(logger));
+        soup_logger_set_printer(logger, soupLogPrinter, 0, 0);
         g_object_unref(logger);
     }
 #endif // !LOG_DISABLED
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to