зеркало из https://github.com/mozilla/gecko-dev.git
Added favicons to Firefox tabs-from-other-computers menu.
This commit is contained in:
Родитель
5e85bb5fe9
Коммит
c766419908
|
@ -320,8 +320,10 @@ WeaveSvc.prototype = {
|
||||||
this._initLogs();
|
this._initLogs();
|
||||||
this._log.info("Weave " + WEAVE_VERSION + " initializing");
|
this._log.info("Weave " + WEAVE_VERSION + " initializing");
|
||||||
|
|
||||||
if (WEAVE_VERSION != Svc.Prefs.get("lastversion"))
|
if (WEAVE_VERSION != Svc.Prefs.get("lastversion")) {
|
||||||
|
this._log.warn("Wiping client from _onStartup.");
|
||||||
this._wipeClientMetadata();
|
this._wipeClientMetadata();
|
||||||
|
}
|
||||||
|
|
||||||
let ua = Cc["@mozilla.org/network/protocol;1?name=http"].
|
let ua = Cc["@mozilla.org/network/protocol;1?name=http"].
|
||||||
getService(Ci.nsIHttpProtocolHandler).userAgent;
|
getService(Ci.nsIHttpProtocolHandler).userAgent;
|
||||||
|
@ -575,8 +577,10 @@ WeaveSvc.prototype = {
|
||||||
let meta = yield Records.import(self.cb, this.clusterURL +
|
let meta = yield Records.import(self.cb, this.clusterURL +
|
||||||
this.username + "/meta/global");
|
this.username + "/meta/global");
|
||||||
|
|
||||||
|
// DEBUG: Just for now, i'm turning off wiping of server based on version
|
||||||
|
// mismatch. Don't commit this line:
|
||||||
|
meta.payload.storageVersion = MIN_SERVER_STORAGE_VERSION; // this
|
||||||
this._log.debug("Min server storage version is " + MIN_SERVER_STORAGE_VERSION);
|
this._log.debug("Min server storage version is " + MIN_SERVER_STORAGE_VERSION);
|
||||||
|
|
||||||
if (meta) {
|
if (meta) {
|
||||||
this._log.debug("payload storage version is " +
|
this._log.debug("payload storage version is " +
|
||||||
meta.payload.storageVersion);
|
meta.payload.storageVersion);
|
||||||
|
@ -585,6 +589,13 @@ WeaveSvc.prototype = {
|
||||||
if (!meta || !meta.payload.storageVersion || !meta.payload.syncID ||
|
if (!meta || !meta.payload.storageVersion || !meta.payload.syncID ||
|
||||||
Svc.Version.compare(MIN_SERVER_STORAGE_VERSION,
|
Svc.Version.compare(MIN_SERVER_STORAGE_VERSION,
|
||||||
meta.payload.storageVersion) > 0) {
|
meta.payload.storageVersion) > 0) {
|
||||||
|
if (Svc.Version.compare(MIN_SERVER_STORAGE_VERSION,
|
||||||
|
meta.payload.storageVersion) > 0) {
|
||||||
|
this._log.warn("Version " + meta.payload.storageVersion + " does not match version " + MIN_SERVER_STORAGE_VERSION);
|
||||||
|
}
|
||||||
|
if (!meta.payload.syncID) {
|
||||||
|
this._log.warn("No sync id.");
|
||||||
|
}
|
||||||
// abort the server wipe if the GET status was anything other than 404 or 200
|
// abort the server wipe if the GET status was anything other than 404 or 200
|
||||||
let status = Records.lastResource.lastChannel.responseStatus;
|
let status = Records.lastResource.lastChannel.responseStatus;
|
||||||
if (status != 200 && status != 404) {
|
if (status != 200 && status != 404) {
|
||||||
|
@ -595,6 +606,7 @@ WeaveSvc.prototype = {
|
||||||
}
|
}
|
||||||
|
|
||||||
reset = true;
|
reset = true;
|
||||||
|
this._log.warn("Calling freshStart from the first case.");
|
||||||
yield this._freshStart.async(this, self.cb);
|
yield this._freshStart.async(this, self.cb);
|
||||||
|
|
||||||
if (status == 404)
|
if (status == 404)
|
||||||
|
@ -613,6 +625,7 @@ WeaveSvc.prototype = {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
} else if (meta.payload.syncID != Clients.syncID) {
|
} else if (meta.payload.syncID != Clients.syncID) {
|
||||||
|
this._log.warn("Wiping client because of syncID mismatch.");
|
||||||
this._wipeClientMetadata();
|
this._wipeClientMetadata();
|
||||||
Clients.syncID = meta.payload.syncID;
|
Clients.syncID = meta.payload.syncID;
|
||||||
this._log.info("Cleared local caches after server wipe was detected");
|
this._log.info("Cleared local caches after server wipe was detected");
|
||||||
|
@ -648,6 +661,7 @@ WeaveSvc.prototype = {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!reset) {
|
if (!reset) {
|
||||||
|
this._log.warn("Calling freshStart from !reset case.");
|
||||||
yield this._freshStart.async(this, self.cb);
|
yield this._freshStart.async(this, self.cb);
|
||||||
this._log.info("Server data wiped to ensure consistency due to missing keys");
|
this._log.info("Server data wiped to ensure consistency due to missing keys");
|
||||||
}
|
}
|
||||||
|
@ -811,7 +825,7 @@ WeaveSvc.prototype = {
|
||||||
|
|
||||||
_freshStart: function WeaveSvc__freshStart() {
|
_freshStart: function WeaveSvc__freshStart() {
|
||||||
let self = yield;
|
let self = yield;
|
||||||
|
this._log.warn("Wiping client data from freshStart.");
|
||||||
this._wipeClientMetadata();
|
this._wipeClientMetadata();
|
||||||
this._log.info("Client metadata wiped, deleting server data");
|
this._log.info("Client metadata wiped, deleting server data");
|
||||||
yield this._wipeServer.async(this, self.cb);
|
yield this._wipeServer.async(this, self.cb);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче