Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-26 19:55:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1468025 - Define lazy getter for TCPListener in Marionette component. r=whimboo

Browse Source 
This patch reorganises imports and getter definitions to match
style used elsewhere, and defines TCPListener as a lazy getter.

MozReview-Commit-ID: Dq2ufYzVcvE

--HG--
extra : rebase_source : 5b2510688a8fa0bcefa9bf0e760e92b0c1c982ce
This commit is contained in:
Andreas Tolfsen 2018-06-09 18:51:13 +01:00
parent 7a8929b71a
commit 6a246179dc
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
testing/marionette/components/marionette.js
View File

@ -7,22 +7,26 @@
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyServiceGetter(
this, "env", "@mozilla.org/process/environment;1", "nsIEnvironment");
ChromeUtils.defineModuleGetter(this, "Log",
"resource://gre/modules/Log.jsm");
const {
EnvironmentPrefs,
MarionettePrefs,
} = ChromeUtils.import("chrome://marionette/content/prefs.js", {});
ChromeUtils.defineModuleGetter(this, "Preferences",
"resource://gre/modules/Preferences.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
Log: "resource://gre/modules/Log.jsm",
Preferences: "resource://gre/modules/Preferences.jsm",
TCPListener: "chrome://marionette/content/server.js",
});
XPCOMUtils.defineLazyGetter(this, "log", () => {
let log = Log.repository.getLogger("Marionette");
log.addAppender(new Log.DumpAppender());
return log;
});
XPCOMUtils.defineLazyServiceGetter(
this, "env", "@mozilla.org/process/environment;1", "nsIEnvironment");
const NOTIFY_RUNNING = "remote-active";
// Complements -marionette flag for starting the Marionette server.
@ -441,10 +445,8 @@ class MarionetteParentProcess {
}
try {
const {TCPListener} = ChromeUtils.import("chrome://marionette/content/server.js", {});
let listener = new TCPListener(MarionettePrefs.port);
listener.start();
this.server = listener;
this.server = new TCPListener(MarionettePrefs.port);
this.server.start();
} catch (e) {
log.fatal("Remote protocol server failed to start", e);
this.uninit();