[Pkg-mozext-commits] [firetray] 16/84: * adapt to Log4Moz -> Log renaming (FF 27+) * fix typo (Cu.reportError)
David Prévot
taffit at moszumanska.debian.org
Sun Jul 20 01:42:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository firetray.
commit 8f8fad3afcbdaab773dc36b64065a8b860729cb3
Author: foudfou <foudil.newbie+git at gmail.com>
Date: Wed Jan 22 22:39:31 2014 +0100
* adapt to Log4Moz -> Log renaming (FF 27+)
* fix typo (Cu.reportError)
---
src/modules/ctypes/winnt/kernel32.jsm | 2 +-
src/modules/logging.jsm | 34 ++++++++++++++++++++--------------
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/modules/ctypes/winnt/kernel32.jsm b/src/modules/ctypes/winnt/kernel32.jsm
index a6d40e7..f6c6b02 100644
--- a/src/modules/ctypes/winnt/kernel32.jsm
+++ b/src/modules/ctypes/winnt/kernel32.jsm
@@ -45,5 +45,5 @@ osvi.dwOSVersionInfoSize = kernel32.OSVERSIONINFOEXW.size;
if (kernel32.GetVersionExW(osvi.address())) {
win32.WINVER = (+osvi.dwMajorVersion)*10 + (+osvi.dwMinorVersion); // ctypes.UInt64 objects!
} else {
- Cu.ReportError("win version not found");
+ Cu.reportError("win version not found");
}
diff --git a/src/modules/logging.jsm b/src/modules/logging.jsm
index 0801c31..f60332f 100644
--- a/src/modules/logging.jsm
+++ b/src/modules/logging.jsm
@@ -47,6 +47,7 @@ var colorTermLogColors = {
if ("undefined" == typeof(firetray)) {
var firetray = {};
};
+var LogMod;
// https://wiki.mozilla.org/Labs/JS_Modules#Logging
firetray.Logging = {
@@ -55,17 +56,22 @@ firetray.Logging = {
init: function() {
if (this.initialized) return;
- ["resource://services-common/log4moz.js", // FF
- "resource:///app/modules/gloda/log4moz.js", // TB
- "resource://firetray/log4moz.js"] // default
+ ["resource://gre/modules/Log.jsm", // FF 27+
+ "resource://services-common/log4moz.js", // FF
+ "resource:///app/modules/gloda/log4moz.js", // TB
+ "resource://firetray/log4moz.js"] // default
.forEach(function(file){
try {Cu.import(file);} catch(x) {}
}, this);
- if ("undefined" == typeof(Log4Moz)) {
- let errMsg = "log4moz.js not found";
+ if ("undefined" != typeof(Log)) {
+ LogMod = Log;
+ } else if ("undefined" != typeof(Log4Moz)) {
+ LogMod = Log4Moz;
+ } else {
+ let errMsg = "Log module not found";
dump(errMsg+"\n");
- Cu.ReportError(errMsg);
+ Cu.reportError(errMsg);
};
this.setupLogging("firetray");
@@ -81,7 +87,7 @@ firetray.Logging = {
// lifted from log4moz.js
function SimpleFormatter() {}
SimpleFormatter.prototype = {
- __proto__: Log4Moz.Formatter.prototype,
+ __proto__: LogMod.Formatter.prototype,
format: function(message) {
let messageString = "";
@@ -122,14 +128,14 @@ firetray.Logging = {
};
// Loggers are hierarchical, affiliation is handled by a '.' in the name.
- this._logger = Log4Moz.repository.getLogger(loggerName);
+ this._logger = LogMod.repository.getLogger(loggerName);
// Lowering this log level will affect all of our addon output
- this._logger.level = Log4Moz.Level[FIRETRAY_LOG_LEVEL];
+ this._logger.level = LogMod.Level[FIRETRAY_LOG_LEVEL];
// A console appender outputs to the JS Error Console
let simpleFormatter = new SimpleFormatter();
- let capp = new Log4Moz.ConsoleAppender(simpleFormatter);
- capp.level = Log4Moz.Level["Debug"];
+ let capp = new LogMod.ConsoleAppender(simpleFormatter);
+ capp.level = LogMod.Level["Debug"];
this._logger.addAppender(capp);
// A dump appender outputs to standard out
@@ -139,13 +145,13 @@ firetray.Logging = {
} else {
dumpFormatter = new SimpleFormatter();
}
- let dapp = new Log4Moz.DumpAppender(dumpFormatter);
- dapp.level = Log4Moz.Level["Debug"];
+ let dapp = new LogMod.DumpAppender(dumpFormatter);
+ dapp.level = LogMod.Level["Debug"];
this._logger.addAppender(dapp);
},
getLogger: function(loggerName){
- return Log4Moz.repository.getLogger(loggerName);
+ return LogMod.repository.getLogger(loggerName);
}
}; // firetray.Logging
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git
More information about the Pkg-mozext-commits
mailing list