wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1232615 - Properly parse server logs without a label. r=jryans

Browse Source
This commit is contained in:
Jan Odvarko 2016-01-06 08:47:56 +01:00
parent 03a46106e1
commit 808c6c0ebc
5 changed files with 75 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devtools/client/webconsole/test/browser.ini
View File

@ -74,6 +74,7 @@ support-files =
test-console-extras.html
test-console-replaced-api.html
test-console-server-logging.sjs
test-console-server-logging-array.sjs
test-console.html
test-console-workers.html
test-console-table.html

33
devtools/client/webconsole/test/browser_console_server_logging.js
View File

@ -37,10 +37,41 @@ add_task(function* () {
yield updateServerLoggingListener(hud);
});
add_task(function* () {
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/test-console-server-logging-array.sjs";
yield loadTab(TEST_URI);
let hud = yield openConsole();
// Set logging filter and wait till it's set on the backend
hud.setFilterState("serverlog", true);
yield updateServerLoggingListener(hud);
BrowserReloadSkipCache();
// Note that the test is also checking out the (printf like)
// formatters and encoding of UTF8 characters (see the one at the end).
let text = "Object { best: \"Firefox\", reckless: \"Chrome\", new_ie: \"Safari\", new_new_ie: \"Edge\" }";
yield waitForMessages({
webconsole: hud,
messages: [{
text: text,
category: CATEGORY_SERVER,
severity: SEVERITY_LOG,
}],
})
// Clean up filter
hud.setFilterState("serverlog", false);
yield updateServerLoggingListener(hud);
});
function updateServerLoggingListener(hud) {
let deferred = promise.defer();
hud.ui._updateServerLoggingListener(response => {
deferred.resolve(response);
});
return deferred.promise;
}
}

32
devtools/client/webconsole/test/test-console-server-logging-array.sjs Normal file
View File

@ -0,0 +1,32 @@
/*
* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
function handleRequest(request, response)
{
var page = "<!DOCTYPE html><html>" +
"<head><meta charset='utf-8'></head>" +
"<body><p>hello world!</p></body>" +
"</html>";
var data = {
"version": "4.1.0",
"columns": ["log", "backtrace", "type"],
"rows":[[
[{ "best": "Firefox", "reckless": "Chrome", "new_ie": "Safari", "new_new_ie": "Edge"}],
"C:\\src\\www\\serverlogging\\test7.php:4:1",
""
]],
};
// Put log into headers.
var value = b64EncodeUnicode(JSON.stringify(data));
response.setHeader("X-ChromeLogger-Data", value, false);
response.write(page);
}
function b64EncodeUnicode(str) {
return btoa(unescape(encodeURIComponent(str)));
}

2
devtools/client/webconsole/test/test-console-server-logging.sjs
View File

@ -29,4 +29,4 @@ function handleRequest(request, response)
function b64EncodeUnicode(str) {
return btoa(unescape(encodeURIComponent(str)));
}
}

10
devtools/shared/webconsole/server-logger.js
View File

@ -408,7 +408,15 @@ function format(msg) {
msg.styles = [];
// Remove and get the first log (in which the specifiers are).
let firstString = msg.logs.shift();
// Note that the first string doesn't have to be specified.
// An example of a log on the server side:
// ChromePhp::log("server info: ", $_SERVER);
// ChromePhp::log($_SERVER);
let firstString = "";
if (typeof msg.logs[0] == "string") {
firstString = msg.logs.shift();
}
// All the specifiers present in the first string.
let splitLogRegExp = /(.*?)(%[oOcsdif]|$)/g;
let splitLogRegExpRes;