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 1146068 (part 2) - fix log manager to automatically set log level for all logs under its control. r=adw

Browse Source
This commit is contained in:
Mark Hammond 2015-03-25 16:28:18 +11:00
parent 93a7e2dc6a
commit 7a2e1550f2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/common/logmanager.js
View File

@ -80,7 +80,11 @@ LogManager.prototype = {
let observer = newVal => { let observer = newVal => {
let level = Log.Level[newVal] || defaultLevel; let level = Log.Level[newVal] || defaultLevel;
if (findSmallest) { if (findSmallest) {
// We need to find the smallest value from all prefs controlling this appender. // As some of our appenders have global impact (ie, there is only one
// place 'dump' goes to), we need to find the smallest value from all
// prefs controlling this appender.
// For example, if consumerA has dump=Debug then consumerB sets
// dump=Error, we need to keep dump=Debug so consumerA is respected.
for (let branch of allBranches) { for (let branch of allBranches) {
let lookPrefBranch = new Preferences(branch); let lookPrefBranch = new Preferences(branch);
let lookVal = Log.Level[lookPrefBranch.get(prefName)]; let lookVal = Log.Level[lookPrefBranch.get(prefName)];
@ -110,6 +114,12 @@ LogManager.prototype = {
// now attach the appenders to all our logs. // now attach the appenders to all our logs.
for (let logName of logNames) { for (let logName of logNames) {
let log = Log.repository.getLogger(logName); let log = Log.repository.getLogger(logName);
// Set all of the logs themselves to log all messages, and rely on the
// more restrictive levels on the appenders to restrict what is seen.
// (We possibly could find the smallest appender level and set the logs
// to that, but that gets tricky when we consider a singe log might end
// up being managed by multiple log managers - so this is fine for now.)
log.level = Log.Level.All;
for (let appender of [fapp, dumpAppender, consoleAppender]) { for (let appender of [fapp, dumpAppender, consoleAppender]) {
log.addAppender(appender); log.addAppender(appender);
} }