From a9c13359dc4c38cb357c3826c35dac563ade7391 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Tue, 31 Oct 2017 13:06:54 -0400 Subject: [PATCH] first attempt to add new GetParameters method to CrashReporter --- atom/common/api/atom_api_crash_reporter.cc | 6 +++++- atom/common/crash_reporter/crash_reporter.cc | 11 ++++++----- atom/common/crash_reporter/crash_reporter.h | 1 + lib/common/api/crash-reporter.js | 4 ++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/atom/common/api/atom_api_crash_reporter.cc b/atom/common/api/atom_api_crash_reporter.cc index 9a6fd27ed521..255283ab762b 100644 --- a/atom/common/api/atom_api_crash_reporter.cc +++ b/atom/common/api/atom_api_crash_reporter.cc @@ -39,6 +39,9 @@ void RemoveExtraParameter(const std::string& key) { CrashReporter::GetInstance()->RemoveExtraParameter(key); } +crash_reporter::CrashReporter::StringMap GetParameters() { + return CrashReporter::GetInstance()->GetParameters(); +} void Initialize(v8::Local exports, v8::Local unused, v8::Local context, void* priv) { @@ -46,7 +49,8 @@ void Initialize(v8::Local exports, v8::Local unused, auto reporter = base::Unretained(CrashReporter::GetInstance()); dict.SetMethod("start", base::Bind(&CrashReporter::Start, reporter)); dict.SetMethod("setExtraParameter", &SetExtraParameter); - dict.SetMethod("removeExtraParameter", &SetExtraParameter); + dict.SetMethod("removeExtraParameter", &RemoveExtraParameter); + dict.SetMethod("getParameters", &GetParameters); dict.SetMethod("getUploadedReports", base::Bind(&CrashReporter::GetUploadedReports, reporter)); dict.SetMethod("setUploadToServer", diff --git a/atom/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc index d901f83fa49f..b65720b8bc29 100644 --- a/atom/common/crash_reporter/crash_reporter.cc +++ b/atom/common/crash_reporter/crash_reporter.cc @@ -83,14 +83,15 @@ void CrashReporter::InitBreakpad(const std::string& product_name, bool skip_system_crash_handler) { } -void CrashReporter::SetUploadParameters() { -} +void CrashReporter::SetUploadParameters() {} void CrashReporter::SetExtraParameter(const std::string& key, - const std::string& value) { -} + const std::string& value) {} -void CrashReporter::RemoveExtraParameter(const std::string& key) { +void CrashReporter::RemoveExtraParameter(const std::string& key) {} + +StringMap CrashReporter::GetParameters() { + return upload_parameters_; } #if defined(OS_MACOSX) && defined(MAS_BUILD) diff --git a/atom/common/crash_reporter/crash_reporter.h b/atom/common/crash_reporter/crash_reporter.h index 2bdcd9b02d3b..1ef16ed505bb 100644 --- a/atom/common/crash_reporter/crash_reporter.h +++ b/atom/common/crash_reporter/crash_reporter.h @@ -40,6 +40,7 @@ class CrashReporter { virtual void SetExtraParameter(const std::string& key, const std::string& value); virtual void RemoveExtraParameter(const std::string& key); + virtual CrashReporter::StringMap GetParameters(); protected: CrashReporter(); diff --git a/lib/common/api/crash-reporter.js b/lib/common/api/crash-reporter.js index 79ae5e56b227..6b9f14a9785b 100644 --- a/lib/common/api/crash-reporter.js +++ b/lib/common/api/crash-reporter.js @@ -108,6 +108,10 @@ class CrashReporter { setExtraParameter (key, value) { binding.setExtraParameter(key, value) } + + getParameters (key, value) { + binding.getParameters() + } } module.exports = new CrashReporter()