Commit 3396f073 authored by Blair McBride's avatar Blair McBride
Browse files

Bug 451283 - Move log4moz.js to Toolkit as Log.jsm. r=gps,Mossop 

--HG--
rename : services/common/log4moz.js => toolkit/modules/Log.jsm
rename : services/common/tests/unit/test_log4moz.js => toolkit/modules/tests/xpcshell/test_Log.js
parent 9e6c8d2b

browser/base/content/browser-data-submission-info-bar.js

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ let gDataNotificationInfoBar = { 
  },



  get _log() {

    let log4moz = Cu.import("resource://services-common/log4moz.js", {}).Log4Moz;

    let Log = Cu.import("resource://gre/modules/Log.jsm", {}).Log;

    delete this._log;

    return this._log = log4moz.repository.getLogger("Services.DataReporting.InfoBar");

    return this._log = Log.repository.getLogger("Services.DataReporting.InfoBar");

  },



  init: function() {

browser/base/content/test/general/browser_datareporting_notification.js

+4 −4
Original line number Diff line number Diff line
@@ -58,10 +58,10 @@ function test() { 
  waitForExplicitFinish();



  let ns = {};

  Components.utils.import("resource://services-common/log4moz.js", ns);

  rootLogger = ns.Log4Moz.repository.rootLogger;

  dumpAppender = new ns.Log4Moz.DumpAppender();

  dumpAppender.level = ns.Log4Moz.Level.All;

  Components.utils.import("resource://gre/modules/Log.jsm", ns);

  rootLogger = ns.Log.repository.rootLogger;

  dumpAppender = new ns.Log.DumpAppender();

  dumpAppender.level = ns.Log.Level.All;

  rootLogger.addAppender(dumpAppender);



  let notification = document.getElementById("global-notificationbox");

services/common/Makefile.in

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
# You can obtain one at http://mozilla.org/MPL/2.0/.



modules := \

  log4moz.js \

  storageservice.js \

  stringbundle.js \

  tokenserverclient.js \

services/common/bagheeraclient.js

+5 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components; 


Cu.import("resource://gre/modules/Promise.jsm");

Cu.import("resource://gre/modules/Services.jsm");

Cu.import("resource://services-common/log4moz.js");

Cu.import("resource://gre/modules/Log.jsm");

Cu.import("resource://services-common/rest.js");

Cu.import("resource://services-common/utils.js");
@@ -47,8 +47,8 @@ Object.freeze(BagheeraClientRequestResult.prototype); 
function BagheeraRequest(uri) {

  RESTRequest.call(this, uri);



  this._log = Log4Moz.repository.getLogger("Services.BagheeraClient");

  this._log.level = Log4Moz.Level.Debug;

  this._log = Log.repository.getLogger("Services.BagheeraClient");

  this._log.level = Log.Level.Debug;

}



BagheeraRequest.prototype = Object.freeze({
@@ -69,8 +69,8 @@ this.BagheeraClient = function BagheeraClient(baseURI) { 
    throw new Error("baseURI argument must be defined.");

  }



  this._log = Log4Moz.repository.getLogger("Services.BagheeraClient");

  this._log.level = Log4Moz.Level.Debug;

  this._log = Log.repository.getLogger("Services.BagheeraClient");

  this._log.level = Log.Level.Debug;



  this.baseURI = baseURI;

services/common/modules-testing/bagheeraserver.js

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ const {utils: Cu} = Components; 


this.EXPORTED_SYMBOLS = ["BagheeraServer"];



Cu.import("resource://services-common/log4moz.js");

Cu.import("resource://gre/modules/Log.jsm");

Cu.import("resource://services-common/utils.js");

Cu.import("resource://testing-common/httpd.js");
@@ -23,7 +23,7 @@ Cu.import("resource://testing-common/httpd.js"); 
 * The Bagheera server is essentially a glorified document store.

 */

this.BagheeraServer = function BagheeraServer() {

  this._log = Log4Moz.repository.getLogger("metrics.BagheeraServer");

  this._log = Log.repository.getLogger("metrics.BagheeraServer");



  this.server = new HttpServer();

  this.namespaces = {};