diff options
| -rw-r--r-- | services/common/utils.js | 4 | ||||
| -rw-r--r-- | services/sync/Weave.js | 3 | ||||
| -rw-r--r-- | services/sync/modules/identity.js | 2 | ||||
| -rw-r--r-- | services/sync/modules/service.js | 15 |
4 files changed, 7 insertions, 17 deletions
diff --git a/services/common/utils.js b/services/common/utils.js index f0f57d14a..c90600ef4 100644 --- a/services/common/utils.js +++ b/services/common/utils.js @@ -69,6 +69,10 @@ this.CommonUtils = { return true; }, + // Import these from Log.jsm for backward compatibility + exceptionStr: Log.exceptionStr, + stackTrace: Log.stackTrace, + /** * Encode byte string as base64URL (RFC 4648). * diff --git a/services/sync/Weave.js b/services/sync/Weave.js index 4c89aba13..0e8d2fe31 100644 --- a/services/sync/Weave.js +++ b/services/sync/Weave.js @@ -103,7 +103,7 @@ WeaveService.prototype = { get fxAccountsEnabled() { // Early exit: FxA not supported. return false; - +/* -- commented out to prevent unreachable code warning -- try { // Old sync guarantees '@' will never appear in the username while FxA // uses the FxA email address - so '@' is the flag we use. @@ -112,6 +112,7 @@ WeaveService.prototype = { } catch (_) { return true; // No username == only allow FxA to be configured. } +*/ }, /** diff --git a/services/sync/modules/identity.js b/services/sync/modules/identity.js index cd28f5efe..624fad21c 100644 --- a/services/sync/modules/identity.js +++ b/services/sync/modules/identity.js @@ -337,7 +337,7 @@ IdentityManager.prototype = { try { this._syncKeyBundle = new SyncKeyBundle(this.username, this.syncKey); } catch (ex) { - this._log.warn(Utils.exceptionStr(ex)); + this._log.warn("Failed to create sync key bundle", Utils.exceptionStr(ex)); return null; } } diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js index f3837a949..2631efafd 100644 --- a/services/sync/modules/service.js +++ b/services/sync/modules/service.js @@ -51,15 +51,6 @@ const STORAGE_INFO_TYPES = [INFO_COLLECTIONS, INFO_COLLECTION_COUNTS, INFO_QUOTA]; -// A structure mapping a (boolean) telemetry probe name to a preference name. -// The probe will record true if the pref is modified, false otherwise. -const TELEMETRY_CUSTOM_SERVER_PREFS = { - WEAVE_CUSTOM_LEGACY_SERVER_CONFIGURATION: "services.sync.serverURL", - WEAVE_CUSTOM_FXA_SERVER_CONFIGURATION: "identity.fxaccounts.auth.uri", - WEAVE_CUSTOM_TOKEN_SERVER_CONFIGURATION: "services.sync.tokenServerURI", -}; - - function Sync11Service() { this._notify = Utils.notify("weave:service:"); } @@ -377,12 +368,6 @@ Sync11Service.prototype = { Svc.Obs.notify("weave:engine:start-tracking"); } - // Telemetry probes to indicate if the user is using custom servers. - for (let [probeName, prefName] of Iterator(TELEMETRY_CUSTOM_SERVER_PREFS)) { - let isCustomized = Services.prefs.prefHasUserValue(prefName); - Services.telemetry.getHistogramById(probeName).add(isCustomized); - } - // Send an event now that Weave service is ready. We don't do this // synchronously so that observers can import this module before // registering an observer. |