Gamedata query no longer detects a failed query as a crash.

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402330
This commit is contained in:
Matt Woodrow 2008-07-02 02:57:08 +00:00
parent 77a7bf385b
commit ce57617744

View File

@ -111,6 +111,8 @@ void FetcherThread::RunThread( IThreadHandle *pHandle )
if (socketDescriptor == INVALID_SOCKET) if (socketDescriptor == INVALID_SOCKET)
{ {
fclose(logfile);
unlink(lock_path);
return; return;
} }
@ -122,12 +124,20 @@ void FetcherThread::RunThread( IThreadHandle *pHandle )
if (len == 0) if (len == 0)
{ {
g_Logger.LogToOpenFile(logfile, "Query Writing failed"); g_Logger.LogToOpenFile(logfile, "Query Writing failed");
closesocket(socketDescriptor);
fclose(logfile);
unlink(lock_path);
return; return;
} }
if (g_disableGameDataUpdate) if (g_disableGameDataUpdate)
{ {
g_Logger.LogMessage("Skipping GameData Query due to DisableAutoUpdate being set to true"); g_Logger.LogMessage("Skipping GameData Query due to DisableAutoUpdate being set to true");
closesocket(socketDescriptor);
fclose(logfile);
unlink(lock_path);
return; return;
} }
@ -138,7 +148,10 @@ void FetcherThread::RunThread( IThreadHandle *pHandle )
if (sent == 0) if (sent == 0)
{ {
g_Logger.LogToOpenFile(logfile, "Failed to send data"); g_Logger.LogToOpenFile(logfile, "Failed to send data");
closesocket(socketDescriptor); closesocket(socketDescriptor);
fclose(logfile);
unlink(lock_path);
return; return;
} }
@ -146,10 +159,7 @@ void FetcherThread::RunThread( IThreadHandle *pHandle )
/* And we're done! */ /* And we're done! */
closesocket(socketDescriptor); closesocket(socketDescriptor);
fclose(logfile); fclose(logfile);
// Delete our lock
unlink(lock_path); unlink(lock_path);
} }