X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fnetworkclient%2Fserv_networkclient.c;h=5d6a6e2dc99a39d438220856b56701bf5de588e3;hp=cc4ac6260a42504ebdbc84e275aa26f13e97213b;hb=998f7ba061f498ff16d542409ffe8926671d92ea;hpb=3507fe14432a1ed1ca70c503fc4d2df026d51ade diff --git a/citadel/modules/networkclient/serv_networkclient.c b/citadel/modules/networkclient/serv_networkclient.c index cc4ac6260..5d6a6e2dc 100644 --- a/citadel/modules/networkclient/serv_networkclient.c +++ b/citadel/modules/networkclient/serv_networkclient.c @@ -327,10 +327,20 @@ eNextState NWC_ReadNDOPReply(AsyncNetworker *NW) NWC_DBG_READ(); if (ChrPtr(NW->IO.IOBuf)[0] == '2') { + int LogLevel = LOG_DEBUG; NW->IO.IOB.TotalSentAlready = 0; + TotalSendSize = atol (ChrPtr(NW->IO.IOBuf) + 4); - EVN_syslog(LOG_DEBUG, "Expecting to transfer %d bytes\n", TotalSendSize); + + if (TotalSendSize > 0) + LogLevel = LOG_INFO; + + EVN_syslog(LogLevel, + "Expecting to transfer %d bytes to %s\n", + TotalSendSize, + ChrPtr(NW->tempFileName)); + if (TotalSendSize <= 0) { NW->State = eNUOP - 1; } @@ -434,7 +444,13 @@ eNextState NWC_ReadREADBlob(AsyncNetworker *NW) ChrPtr(NW->SpoolFileName), strerror(errno)); } - + else { + EVN_syslog(LOG_INFO, + "moved %s to %s\n", + ChrPtr(NW->tempFileName), + ChrPtr(NW->SpoolFileName)); + } + unlink(ChrPtr(NW->tempFileName)); rc = NWC_DispatchWriteDone(&NW->IO); NW->State --; @@ -464,6 +480,12 @@ eNextState NWC_ReadREADBlobDone(AsyncNetworker *NW) ChrPtr(NW->SpoolFileName), strerror(errno)); } + else { + EVN_syslog(LOG_INFO, + "moved %s to %s\n", + ChrPtr(NW->tempFileName), + ChrPtr(NW->SpoolFileName)); + } unlink(ChrPtr(NW->tempFileName)); rc = NWC_DispatchWriteDone(&NW->IO); @@ -542,6 +564,14 @@ eNextState NWC_SendNUOP(AsyncNetworker *NW) if (fd > 0) close(fd); return rc; } + else + { + EVN_syslog(LOG_INFO, + "sending %s to %s\n", + ChrPtr(NW->SpoolFileName), + ChrPtr(NW->node)); + } + FDIOBufferInit(&NW->IO.IOB, &NW->IO.SendBuf, fd, TotalSendSize); StrBufPlain(NW->IO.SendBuf.Buf, HKEY("NUOP\n")); @@ -618,7 +648,12 @@ eNextState NWC_ReadUCLS(AsyncNetworker *NW) AsyncIO *IO = &NW->IO; NWC_DBG_READ(); - EVN_syslog(LOG_NOTICE, "Sent %ld octets to <%s>\n", NW->IO.IOB.ChunkSize, ChrPtr(NW->node)); + EVN_syslog(LOG_NOTICE, + "Sent %s [%ld] octets to <%s>\n", + ChrPtr(NW->SpoolFileName), + NW->IO.IOB.ChunkSize, + ChrPtr(NW->node)); + if (ChrPtr(NW->IO.IOBuf)[0] == '2') { EVN_syslog(LOG_DEBUG, "Removing <%s>\n", ChrPtr(NW->SpoolFileName)); unlink(ChrPtr(NW->SpoolFileName));