maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Retry: do not retry for the first request, MB#8758

Browse source
This commit is contained in:
Chen Congwu 2010-01-05 14:44:19 +08:00
parent 615c2fc3bb
commit 18452a8a9c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/syncevo/SyncContext.cpp
View file

@ -2188,7 +2188,7 @@ bool SyncContext::initSAN(int retries)
int retry = 0;
while (retry++ < retries)
{
SE_LOG_INFO (NULL, NULL, "Server sending SAN %d", retry);
SE_LOG_INFO (NULL, NULL, "Server sending SAN attempts #%d", retry);
m_agent->setContentType (TransportAgent::m_contentTypeServerAlertedNotificationDS);
m_agent->send(reinterpret_cast <char *> (buffer), sanSize);
//change content type
@ -2385,6 +2385,7 @@ SyncMLStatus SyncContext::doSync()
bool aborting = false;
int suspending = 0;
time_t sendStart = 0, resendStart = 0;
int requestNum = 0;
sysync::uInt16 previousStepCmd = stepCmd;
do {
try {
@ -2527,6 +2528,7 @@ SyncMLStatus SyncContext::doSync()
if (m_retryInterval) {
m_agent->setCallback (transport_cb, this, m_retryInterval);
}
requestNum ++;
// use GetSyncMLBuffer()/RetSyncMLBuffer() to access the data to be
// sent or have it copied into caller's buffer using
// ReadSyncMLBuffer(), then send it to the server
@ -2604,7 +2606,7 @@ SyncMLStatus SyncContext::doSync()
case TransportAgent::FAILED: {
time_t curTime = time(NULL);
time_t duration = curTime - sendStart;
if (!m_retryInterval || duration > m_retryDuration) {
if (!m_retryInterval || duration > m_retryDuration || requestNum == 1) {
SE_LOG_INFO(NULL, NULL,
"Transport giving up after %d retries and %ld:%02ldmin",
m_retries,