Skip to content

Commit 071b095

Browse files
committed
Fix debug console to only parse strings and use default logging for everything else
1 parent 2d11e55 commit 071b095

File tree

2 files changed

+35
-13
lines changed

2 files changed

+35
-13
lines changed

Assets/WebGLTemplates/Develop/debug-console.js

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,15 +270,26 @@ function setupConsoleLogPipe() {
270270
let defaultConsoleError = console.error;
271271

272272
// Overwrite log functions to parse and pipe to debug html console
273-
console.log = (message) => { parseMessageAndLog(message, 'log', defaultConsoleLog); };
274-
console.info = (message) => { parseMessageAndLog(message, 'info', defaultConsoleInfo); };
275-
console.debug = (message) => { parseMessageAndLog(message, 'debug', defaultConsoleDebug); };
276-
console.warn = (message) => { parseMessageAndLog(message, 'warn', defaultConsoleWarn); };
277-
console.error = (message) => { parseMessageAndLog(message, 'error', defaultConsoleError); errorReceived(); };
273+
console.log = (message) => { handleLog(message, 'log', defaultConsoleLog); };
274+
console.info = (message) => { handleLog(message, 'info', defaultConsoleInfo); };
275+
console.debug = (message) => { handleLog(message, 'debug', defaultConsoleDebug); };
276+
console.warn = (message) => { handleLog(message, 'warn', defaultConsoleWarn); };
277+
console.error = (message) => { handleLog(message, 'error', defaultConsoleError); errorReceived(); };
278278

279279

280-
parseMessageAndLog = (message, logLevel, consoleLogFunction) => {
280+
handleLog = (message, logLevel, consoleLogFunction) => {
281281
updateLogCounter(logLevel);
282+
if (typeof message === 'string') {
283+
// Only parse messages that are actual strings
284+
parseMessageAndLog(message, logLevel, consoleLogFunction);
285+
}
286+
else {
287+
consoleLogFunction(message);
288+
htmlLog(JSON.stringify(message), logLevel);
289+
}
290+
};
291+
292+
parseMessageAndLog = (message, logLevel, consoleLogFunction) => {
282293
let styledTextParts = parseUnityRichText(message);
283294

284295
let consoleText = '';

Assets/WebGLTemplates/Release/pretty-console.js

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,25 @@ function setupConsoleLogPipe() {
1010
let defaultConsoleError = console.error;
1111

1212
// Overwrite log functions to parse and pipe to debug html console
13-
console.log = (message) => { parseMessageAndLog(message, defaultConsoleLog); };
14-
console.info = (message) => { parseMessageAndLog(message, defaultConsoleInfo); };
15-
console.debug = (message) => { parseMessageAndLog(message, defaultConsoleDebug); };
16-
console.warn = (message) => { parseMessageAndLog(message, defaultConsoleWarn); };
17-
console.error = (message) => { parseMessageAndLog(message, defaultConsoleError); };
18-
13+
console.log = (message) => { handleLog(message, 'log', defaultConsoleLog); };
14+
console.info = (message) => { handleLog(message, 'info', defaultConsoleInfo); };
15+
console.debug = (message) => { handleLog(message, 'debug', defaultConsoleDebug); };
16+
console.warn = (message) => { handleLog(message, 'warn', defaultConsoleWarn); };
17+
console.error = (message) => { handleLog(message, 'error', defaultConsoleError); errorReceived(); };
18+
19+
20+
handleLog = (message, logLevel, consoleLogFunction) => {
21+
updateLogCounter(logLevel);
22+
if (typeof message === 'string') {
23+
// Only parse messages that are actual strings
24+
parseMessageAndLog(message, logLevel, consoleLogFunction);
25+
}
26+
else {
27+
consoleLogFunction(message);
28+
}
29+
};
1930

20-
parseMessageAndLog = (message, consoleLogFunction) => {
31+
parseMessageAndLog = (message, logLevel, consoleLogFunction) => {
2132
let styledTextParts = parseUnityRichText(message);
2233
let consoleText = '';
2334
let consoleStyle = [];

0 commit comments

Comments
 (0)