mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Clear crash keys in InitBreakpad

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-06 16:31:20 -08:00
parent ba975d552a
commit 9a434af03e
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/common/crash_reporter/crash_reporter_linux.cc
View file

@ -64,13 +64,15 @@ void CrashReporterLinux::InitBreakpad(const std::string& product_name,
bool skip_system_crash_handler) { bool skip_system_crash_handler) {
EnableCrashDumping(crashes_dir); EnableCrashDumping(crashes_dir);
crash_keys_.SetKeyValue("prod", ATOM_PRODUCT_NAME); crash_keys_.reset(new CrashKeyStorage());
crash_keys_.SetKeyValue("ver", version.c_str());
crash_keys_->SetKeyValue("prod", ATOM_PRODUCT_NAME);
crash_keys_->SetKeyValue("ver", version.c_str());
upload_url_ = submit_url; upload_url_ = submit_url;
for (StringMap::const_iterator iter = upload_parameters_.begin(); for (StringMap::const_iterator iter = upload_parameters_.begin();
iter != upload_parameters_.end(); ++iter) iter != upload_parameters_.end(); ++iter)
crash_keys_.SetKeyValue(iter->first.c_str(), iter->second.c_str()); crash_keys_->SetKeyValue(iter->first.c_str(), iter->second.c_str());
} }
void CrashReporterLinux::SetUploadParameters() { void CrashReporterLinux::SetUploadParameters() {
@ -120,7 +122,7 @@ bool CrashReporterLinux::CrashDone(const MinidumpDescriptor& minidump,
info.oom_size = base::g_oom_size; info.oom_size = base::g_oom_size;
info.pid = self->pid_; info.pid = self->pid_;
info.upload_url = self->upload_url_.c_str(); info.upload_url = self->upload_url_.c_str();
info.crash_keys = &self->crash_keys_; info.crash_keys = self->crash_keys_.get();
HandleCrashDump(info); HandleCrashDump(info);
return true; return true;
} }

2
atom/common/crash_reporter/crash_reporter_linux.h
View file

@ -49,7 +49,7 @@ class CrashReporterLinux : public CrashReporter {
const bool succeeded); const bool succeeded);
std::unique_ptr<google_breakpad::ExceptionHandler> breakpad_; std::unique_ptr<google_breakpad::ExceptionHandler> breakpad_;
CrashKeyStorage crash_keys_; std::unique_ptr<CrashKeyStorage> crash_keys_;
uint64_t process_start_time_; uint64_t process_start_time_;
pid_t pid_; pid_t pid_;