Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7633)

Unified Diff: chrome/browser/sync/engine/syncer_proto_util.cc

Issue 9158004: Detect sync server communication errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/engine/syncer_proto_util.cc
diff --git a/chrome/browser/sync/engine/syncer_proto_util.cc b/chrome/browser/sync/engine/syncer_proto_util.cc
index f5169261f8c12c9191d4c06362c0fa9324d0ab82..2f7ead150fb8b50f9f45ac95ec346e167df1f2c4 100644
--- a/chrome/browser/sync/engine/syncer_proto_util.cc
+++ b/chrome/browser/sync/engine/syncer_proto_util.cc
@@ -80,6 +80,30 @@ void LogResponseProfilingData(const ClientToServerResponse& response) {
}
}
+SyncerError ServerConnectionErrorAsSyncerError(
+ const HttpResponse::ServerConnectionCode server_status) {
+ switch (server_status) {
+ case HttpResponse::CONNECTION_UNAVAILABLE:
+ return NETWORK_CONNECTION_UNAVAILABLE;
+ case HttpResponse::IO_ERROR:
+ return NETWORK_IO_ERROR;
+ case HttpResponse::SYNC_SERVER_ERROR:
+ // FIXME what does this mean?
+ return SYNC_SERVER_ERROR;
+ case HttpResponse::SYNC_AUTH_ERROR:
+ return SYNC_AUTH_ERROR;
+ case HttpResponse::RETRY:
+ return SERVER_RETURN_TRANSIENT_ERROR;
+ case HttpResponse::SERVER_CONNECTION_OK:
+ case HttpResponse::NONE:
+ default:
+ NOTREACHED();
+ return UNSET;
+ }
+}
+
+
tim (not reviewing) 2012/01/10 17:17:34 nit - extra newline
rlarocque 2012/01/10 20:40:56 Done.
+
} // namespace
// static
@@ -303,7 +327,7 @@ browser_sync::SyncProtocolError ConvertLegacyErrorCodeToNewError(
} // namespace
// static
-bool SyncerProtoUtil::PostClientToServerMessage(
+SyncerError SyncerProtoUtil::PostClientToServerMessage(
const ClientToServerMessage& msg,
ClientToServerResponse* response,
SyncSession* session) {
@@ -317,11 +341,20 @@ bool SyncerProtoUtil::PostClientToServerMessage(
ScopedDirLookup dir(session->context()->directory_manager(),
session->context()->account_name());
if (!dir.good())
- return false;
+ return DIRECTORY_LOOKUP_FAILED;
if (!PostAndProcessHeaders(session->context()->connection_manager(), session,
- msg, response))
- return false;
+ msg, response)) {
+ // There was an error establishing communication with the server.
+ // We can not proceed beyond this point.
+ const browser_sync::HttpResponse::ServerConnectionCode server_status =
+ session->context()->connection_manager()->server_status();
+
+ DCHECK(server_status != browser_sync::HttpResponse::NONE);
tim (not reviewing) 2012/01/10 17:17:34 use DCHECK_NE
rlarocque 2012/01/10 20:40:56 Done.
+ DCHECK(server_status != browser_sync::HttpResponse::SERVER_CONNECTION_OK);
+
+ return ServerConnectionErrorAsSyncerError(server_status);
+ }
browser_sync::SyncProtocolError sync_protocol_error;
@@ -352,28 +385,29 @@ bool SyncerProtoUtil::PostClientToServerMessage(
case browser_sync::UNKNOWN_ERROR:
LOG(WARNING) << "Sync protocol out-of-date. The server is using a more "
<< "recent version.";
- return false;
+ return SERVER_RETURN_UNKNOWN_ERROR;
case browser_sync::SYNC_SUCCESS:
LogResponseProfilingData(*response);
- return true;
+ return SYNCER_OK;
case browser_sync::THROTTLED:
LOG(WARNING) << "Client silenced by server.";
HandleThrottleError(sync_protocol_error,
base::TimeTicks::Now() + GetThrottleDelay(*response),
session->context(),
session->delegate());
- return false;
+ return SERVER_RETURN_THROTTLED;
case browser_sync::TRANSIENT_ERROR:
- return false;
+ return SERVER_RETURN_TRANSIENT_ERROR;
case browser_sync::MIGRATION_DONE:
HandleMigrationDoneResponse(response, session);
- return false;
+ return SERVER_RETURN_MIGRATION_DONE;
case browser_sync::CLEAR_PENDING:
+ return SERVER_RETURN_CLEAR_PENDING;
case browser_sync::NOT_MY_BIRTHDAY:
- return false;
+ return SERVER_RETURN_NOT_MY_BIRTHDAY;
default:
NOTREACHED();
- return false;
+ return UNSET;
}
}

Powered by Google App Engine
This is Rietveld 408576698