소스 검색

Improving logging of FTP transfer failures (2nd)

(cherry picked from commit 18d386923dc63df1b3392a7710eee1d2c283a471)

Source commit: 3a6a4261f0dfc3cdd159a03659c44927dc10cbfb
Martin Prikryl 5 년 전
부모
커밋
f921e2ad35
2개의 변경된 파일16개의 추가작업 그리고 0개의 파일을 삭제
  1. 11 0
      source/filezilla/FtpControlSocket.cpp
  2. 5 0
      source/filezilla/TransferSocket.cpp

+ 11 - 0
source/filezilla/FtpControlSocket.cpp

@@ -3752,6 +3752,17 @@ void CFtpControlSocket::FileTransfer(t_transferfile *transferfile/*=0*/,BOOL bFi
       }
       break;
     case FILETRANSFER_WAITFINISH:
+      if (bFinish)
+      {
+        if (nError)
+        {
+          LogMessage(FZ_LOG_INFO, L"Transfer completed");
+        }
+        else
+        {
+          LogMessage(FZ_LOG_INFO, L"Transfer failed");
+        }
+      }
       if (!bFinish)
       {
         if (code == 1)

+ 5 - 0
source/filezilla/TransferSocket.cpp

@@ -1129,8 +1129,13 @@ void CTransferSocket::EnsureSendClose(int Mode)
   {
     if (Mode != 0)
     {
+      m_pOwner->ShowStatus(L"Data connection failed", FZ_LOG_INFO);
       m_nMode |= Mode;
     }
+    else
+    {
+      m_pOwner->ShowStatus(L"Data connection closed", FZ_LOG_INFO);
+    }
     m_bSentClose = TRUE;
     DebugCheck(m_pOwner->m_pOwner->PostThreadMessage(m_nInternalMessageID, FZAPI_THREADMSG_TRANSFEREND, m_nMode));
   }