wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't update the cluster on each login unless verify login failed or there was no cluster set.

Browse Source
This commit is contained in:
Edward Lee 2009-09-21 18:03:56 -07:00
parent 0e855e54d8
commit 6ffc23f7f0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
services/sync/modules/service.js
View File

@ -217,7 +217,7 @@ WeaveSvc.prototype = {
get serverURL() Svc.Prefs.get("serverURL"), get serverURL() Svc.Prefs.get("serverURL"),
set serverURL(value) Svc.Prefs.set("serverURL", value), set serverURL(value) Svc.Prefs.set("serverURL", value),
get clusterURL() Svc.Prefs.get("clusterURL"), get clusterURL() Svc.Prefs.get("clusterURL", ""),
set clusterURL(value) { set clusterURL(value) {
Svc.Prefs.set("clusterURL", value); Svc.Prefs.set("clusterURL", value);
this._updateCachedURLs(); this._updateCachedURLs();
@ -264,6 +264,10 @@ WeaveSvc.prototype = {
}, },
_updateCachedURLs: function _updateCachedURLs() { _updateCachedURLs: function _updateCachedURLs() {
// Nothing to cache yet if we don't have the building blocks
if (this.clusterURL == "" || this.username == "")
return;
let storageAPI = this.clusterURL + "0.5/"; let storageAPI = this.clusterURL + "0.5/";
let userBase = storageAPI + this.username + "/"; let userBase = storageAPI + this.username + "/";
this._log.debug("Caching URLs under storage user base: " + userBase); this._log.debug("Caching URLs under storage user base: " + userBase);
@ -513,7 +517,10 @@ WeaveSvc.prototype = {
_verifyLogin: function _verifyLogin() _verifyLogin: function _verifyLogin()
this._catch(this._notify("verify-login", "", function() { this._catch(this._notify("verify-login", "", function() {
this._setCluster(); // Make sure we have a cluster to verify against
if (this.clusterURL == "")
this._setCluster();
let res = new Resource(this.infoURL); let res = new Resource(this.infoURL);
try { try {
let test = res.get(); let test = res.get();
@ -528,7 +535,7 @@ WeaveSvc.prototype = {
case 401: case 401:
case 404: case 404:
// Check that we're verifying with the correct cluster // Check that we're verifying with the correct cluster
if (this._updateCluster()) if (this._setCluster())
return this._verifyLogin(); return this._verifyLogin();
// We must have the right cluster, but the server doesn't expect us // We must have the right cluster, but the server doesn't expect us