Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add and fix minidump upload logging strings.

Browse Source
This commit is contained in:
/dev/urandom
2016-08-29 10:18:27 +02:00
parent 3b9134422d
commit 9b87ca8ff7
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Components/Modules/MinidumpUpload.cpp
View File

@ -232,6 +232,7 @@ namespace Components
if (!PathIsDirectoryA(queuedMinidumpsFolder.c_str())) if (!PathIsDirectoryA(queuedMinidumpsFolder.c_str()))
{ {
// Nothing to upload // Nothing to upload
Logger::Print("No minidumps to upload.\n");
return PathFileExistsA(queuedMinidumpsFolder.c_str()) == FALSE; return PathFileExistsA(queuedMinidumpsFolder.c_str()) == FALSE;
} }
@ -249,13 +250,20 @@ namespace Components
PathCombineA(fullPath, queuedMinidumpsFolder.c_str(), ffd.cFileName); PathCombineA(fullPath, queuedMinidumpsFolder.c_str(), ffd.cFileName);
// Try to open this minidump // Try to open this minidump
Logger::Print("Trying to upload %s...\n", fullPath);
auto minidump = Minidump::Open(fullPath); auto minidump = Minidump::Open(fullPath);
if (minidump == NULL) if (minidump == NULL)
{
Logger::Print("Couldn't open minidump.\n");
continue; // file can't be opened continue; // file can't be opened
}
// Upload! // Upload!
if (!MinidumpUpload::Upload(minidump)) if (!MinidumpUpload::Upload(minidump))
{
Logger::Print("Couldn't upload minidump.\n");
continue; // couldn't upload that minidump, keep for another attempt continue; // couldn't upload that minidump, keep for another attempt
}
delete minidump; delete minidump;
@ -266,7 +274,7 @@ namespace Components
} while (FindNextFileA(hFind, &ffd) != 0); } while (FindNextFileA(hFind, &ffd) != 0);
} }
Logger::Print("All minidumps uploaded."); Logger::Print("All minidumps uploaded.\n");
return true; return true;
} }
@ -279,24 +287,26 @@ namespace Components
return false; return false;
} }
auto id = Utils::String::GenerateUUIDString();
std::map<std::string, std::string> extraHeaders = { std::map<std::string, std::string> extraHeaders = {
{"Hash-SHA512", Utils::Cryptography::SHA512::Compute(minidump->ToString(), true)}, {"Hash-SHA512", Utils::Cryptography::SHA512::Compute(minidump->ToString(), true)},
{"Compression", "deflate"}, {"Compression", "deflate"},
{"ID", Utils::String::GenerateUUIDString()}, {"ID", id},
}; };
std::string compressedMinidump = minidump->ToString(); std::string compressedMinidump = minidump->ToString();
Logger::Print("Compressing minidump %s (currently %d bytes)...\n", extraHeaders["ID"], compressedMinidump.size()); Logger::Print("Compressing minidump %s (currently %d bytes)...\n", id.c_str(), compressedMinidump.size());
compressedMinidump = Utils::Compression::ZLib::Compress(compressedMinidump); compressedMinidump = Utils::Compression::ZLib::Compress(compressedMinidump);
#ifndef DISABLE_BASE128 #ifndef DISABLE_BASE128
Logger::Print("Encoding minidump %s (currently %d bytes)...\n", extraHeaders["ID"], compressedMinidump.size()); Logger::Print("Encoding minidump %s (currently %d bytes)...\n", id.c_str(), compressedMinidump.size());
extraHeaders["Encoding"] = "base128"; extraHeaders["Encoding"] = "base128";
compressedMinidump = Utils::String::EncodeBase128(compressedMinidump); compressedMinidump = Utils::String::EncodeBase128(compressedMinidump);
#endif #endif
Logger::Print("Minidump %s now prepared for uploading (currently %d bytes)...\n", extraHeaders["ID"], compressedMinidump.size()); Logger::Print("Minidump %s now prepared for uploading (currently %d bytes)...\n", id.c_str(), compressedMinidump.size());
#ifdef DISABLE_BITMESSAGE #ifdef DISABLE_BITMESSAGE
for (auto& targetUrl : targetUrls) for (auto& targetUrl : targetUrls)
@ -349,7 +359,7 @@ namespace Components
auto partNum = offset / this->maxSegmentSize + 1; auto partNum = offset / this->maxSegmentSize + 1;
extraPartHeaders.insert({ "Part", Utils::String::VA("%d", partNum) }); extraPartHeaders.insert({ "Part", Utils::String::VA("%d", partNum) });
Logger::Print("Uploading minidump %s (part %d out of %d, %d bytes)...\n", extraHeaders["ID"], partNum, totalParts, part.size()); Logger::Print("Uploading minidump %s (part %d out of %d, %d bytes)...\n", id.c_str(), partNum, totalParts, part.size());
BitMessage::Singleton->SendMsg(MinidumpUpload::targetAddress, MinidumpUpload::Encode(part, extraPartHeaders)); BitMessage::Singleton->SendMsg(MinidumpUpload::targetAddress, MinidumpUpload::Encode(part, extraPartHeaders));
} }