Move "Timeout trace" in asyncqueue trace logging

This commit is contained in:
Douglas Clowes
2014-08-06 10:32:27 +10:00
parent bf355fb9ed
commit 08f29ef255

View File

@ -465,11 +465,6 @@ static int CommandTimeout(void *cntx, int mode)
pAsyncQueue self = (pAsyncQueue) cntx;
pAQ_Cmd myCmd = self->command_head;
self->nw_tmr = 0;
if (myCmd->retries > 0) {
--myCmd->retries;
StartCommand(self);
} else {
int iRet;
if (self->trace) {
struct timeval tv;
gettimeofday(&tv, NULL);
@ -477,6 +472,11 @@ static int CommandTimeout(void *cntx, int mode)
"Timeout Trace on AsyncQueue %s", self->queue_name);
SICSLogWriteHexTime(myCmd->tran->inp_buf, myCmd->tran->inp_idx, eLog, &tv);
}
if (myCmd->retries > 0) {
--myCmd->retries;
StartCommand(self);
} else {
int iRet;
iRet =
self->protocol->handleEvent(self->protocol, myCmd->tran,
AQU_TIMEOUT);