Bug 772553 - Warning and logging improvements. r=rnewman

This commit is contained in:
Nick Alexander
2012-07-10 11:08:29 -07:00
parent 7efdc3ef26
commit a06eaecc24
2 changed files with 7 additions and 5 deletions

View File

@@ -234,7 +234,7 @@ public class SyncConfiguration implements CredentialsSource {
}
public SharedPreferences getPrefs() {
Logger.debug(LOG_TAG, "Returning prefs for " + prefsPath);
Logger.trace(LOG_TAG, "Returning prefs for " + prefsPath);
return prefsSource.getPrefs(prefsPath, Utils.SHARED_PREFERENCES_MODE);
}
@@ -254,14 +254,14 @@ public class SyncConfiguration implements CredentialsSource {
String u = prefs.getString(PREF_CLUSTER_URL, null);
try {
clusterURL = new URI(u);
Logger.debug(LOG_TAG, "Set clusterURL from bundle: " + u);
Logger.trace(LOG_TAG, "Set clusterURL from bundle: " + u);
} catch (URISyntaxException e) {
Logger.warn(LOG_TAG, "Ignoring bundle clusterURL (" + u + "): invalid URI.", e);
}
}
if (prefs.contains(PREF_SYNC_ID)) {
syncID = prefs.getString(PREF_SYNC_ID, null);
Logger.debug(LOG_TAG, "Set syncID from bundle: " + syncID);
Logger.trace(LOG_TAG, "Set syncID from bundle: " + syncID);
}
if (prefs.contains(PREF_ENABLED_ENGINE_NAMES)) {
String json = prefs.getString(PREF_ENABLED_ENGINE_NAMES, null);
@@ -386,7 +386,7 @@ public class SyncConfiguration implements CredentialsSource {
protected void setAndPersistClusterURL(URI u, SharedPreferences prefs) {
boolean shouldPersist = (prefs != null) && (clusterURL == null);
Logger.debug(LOG_TAG, "Setting cluster URL to " + u.toASCIIString() +
Logger.trace(LOG_TAG, "Setting cluster URL to " + u.toASCIIString() +
(shouldPersist ? ". Persisting." : ". Not persisting."));
clusterURL = u;
if (shouldPersist) {
@@ -407,7 +407,7 @@ public class SyncConfiguration implements CredentialsSource {
return;
}
setAndPersistClusterURL(uri.resolve("/"), prefs);
Logger.debug(LOG_TAG, "Set cluster URL to " + clusterURL.toASCIIString() + ", given input " + u.toASCIIString());
Logger.trace(LOG_TAG, "Set cluster URL to " + clusterURL.toASCIIString() + ", given input " + u.toASCIIString());
}
public void setClusterURL(URI u) {