temp_path -> temp_dir
This commit is contained in:
parent
0380d3ae50
commit
883c4b63d0
7 changed files with 16 additions and 16 deletions
|
@ -25,14 +25,14 @@ CrashReporter::~CrashReporter() {
|
||||||
void CrashReporter::Start(const std::string& product_name,
|
void CrashReporter::Start(const std::string& product_name,
|
||||||
const std::string& company_name,
|
const std::string& company_name,
|
||||||
const std::string& submit_url,
|
const std::string& submit_url,
|
||||||
const std::string& temp_path,
|
const std::string& temp_dir,
|
||||||
bool auto_submit,
|
bool auto_submit,
|
||||||
bool skip_system_crash_handler,
|
bool skip_system_crash_handler,
|
||||||
const StringMap& extra_parameters) {
|
const StringMap& extra_parameters) {
|
||||||
SetUploadParameters(extra_parameters);
|
SetUploadParameters(extra_parameters);
|
||||||
|
|
||||||
InitBreakpad(product_name, ATOM_VERSION_STRING, company_name, submit_url,
|
InitBreakpad(product_name, ATOM_VERSION_STRING, company_name, submit_url,
|
||||||
temp_path, auto_submit, skip_system_crash_handler);
|
temp_dir, auto_submit, skip_system_crash_handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
base::FilePath CrashReporter::GetCrashesDirectory(
|
base::FilePath CrashReporter::GetCrashesDirectory(
|
||||||
|
@ -50,11 +50,11 @@ void CrashReporter::SetUploadParameters(const StringMap& parameters) {
|
||||||
|
|
||||||
std::vector<CrashReporter::UploadReportResult>
|
std::vector<CrashReporter::UploadReportResult>
|
||||||
CrashReporter::GetUploadedReports(const std::string& product_name,
|
CrashReporter::GetUploadedReports(const std::string& product_name,
|
||||||
const std::string& temp_path) {
|
const std::string& temp_dir) {
|
||||||
std::vector<CrashReporter::UploadReportResult> result;
|
std::vector<CrashReporter::UploadReportResult> result;
|
||||||
|
|
||||||
base::FilePath uploads_path =
|
base::FilePath uploads_path =
|
||||||
GetCrashesDirectory(product_name, temp_path).Append("uploads.log");
|
GetCrashesDirectory(product_name, temp_dir).Append("uploads.log");
|
||||||
std::string file_content;
|
std::string file_content;
|
||||||
if (base::ReadFileToString(uploads_path, &file_content)) {
|
if (base::ReadFileToString(uploads_path, &file_content)) {
|
||||||
std::vector<std::string> reports = base::SplitString(
|
std::vector<std::string> reports = base::SplitString(
|
||||||
|
@ -77,7 +77,7 @@ void CrashReporter::InitBreakpad(const std::string& product_name,
|
||||||
const std::string& version,
|
const std::string& version,
|
||||||
const std::string& company_name,
|
const std::string& company_name,
|
||||||
const std::string& submit_url,
|
const std::string& submit_url,
|
||||||
const std::string& temp_path,
|
const std::string& temp_dir,
|
||||||
bool auto_submit,
|
bool auto_submit,
|
||||||
bool skip_system_crash_handler) {
|
bool skip_system_crash_handler) {
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,14 +25,14 @@ class CrashReporter {
|
||||||
void Start(const std::string& product_name,
|
void Start(const std::string& product_name,
|
||||||
const std::string& company_name,
|
const std::string& company_name,
|
||||||
const std::string& submit_url,
|
const std::string& submit_url,
|
||||||
const std::string& temp_path,
|
const std::string& temp_dir,
|
||||||
bool auto_submit,
|
bool auto_submit,
|
||||||
bool skip_system_crash_handler,
|
bool skip_system_crash_handler,
|
||||||
const StringMap& extra_parameters);
|
const StringMap& extra_parameters);
|
||||||
|
|
||||||
virtual std::vector<CrashReporter::UploadReportResult> GetUploadedReports(
|
virtual std::vector<CrashReporter::UploadReportResult> GetUploadedReports(
|
||||||
const std::string& product_name,
|
const std::string& product_name,
|
||||||
const std::string& temp_path);
|
const std::string& temp_dir);
|
||||||
|
|
||||||
base::FilePath GetCrashesDirectory(const std::string& product_name,
|
base::FilePath GetCrashesDirectory(const std::string& product_name,
|
||||||
const std::string& temp_dir);
|
const std::string& temp_dir);
|
||||||
|
@ -45,7 +45,7 @@ class CrashReporter {
|
||||||
const std::string& version,
|
const std::string& version,
|
||||||
const std::string& company_name,
|
const std::string& company_name,
|
||||||
const std::string& submit_url,
|
const std::string& submit_url,
|
||||||
const std::string& temp_path,
|
const std::string& temp_dir,
|
||||||
bool auto_submit,
|
bool auto_submit,
|
||||||
bool skip_system_crash_handler);
|
bool skip_system_crash_handler);
|
||||||
virtual void SetUploadParameters();
|
virtual void SetUploadParameters();
|
||||||
|
|
|
@ -27,7 +27,7 @@ class CrashReporterMac : public CrashReporter {
|
||||||
const std::string& version,
|
const std::string& version,
|
||||||
const std::string& company_name,
|
const std::string& company_name,
|
||||||
const std::string& submit_url,
|
const std::string& submit_url,
|
||||||
const std::string& temp_path,
|
const std::string& temp_dir,
|
||||||
bool auto_submit,
|
bool auto_submit,
|
||||||
bool skip_system_crash_handler) override;
|
bool skip_system_crash_handler) override;
|
||||||
void SetUploadParameters() override;
|
void SetUploadParameters() override;
|
||||||
|
@ -43,7 +43,7 @@ class CrashReporterMac : public CrashReporter {
|
||||||
const base::StringPiece& value);
|
const base::StringPiece& value);
|
||||||
|
|
||||||
std::vector<UploadReportResult> GetUploadedReports(
|
std::vector<UploadReportResult> GetUploadedReports(
|
||||||
const std::string& path, const std::string& temp_path) override;
|
const std::string& path, const std::string& temp_dir) override;
|
||||||
|
|
||||||
std::unique_ptr<crashpad::SimpleStringDictionary> simple_string_dictionary_;
|
std::unique_ptr<crashpad::SimpleStringDictionary> simple_string_dictionary_;
|
||||||
|
|
||||||
|
|
|
@ -94,10 +94,10 @@ void CrashReporterMac::SetCrashKeyValue(const base::StringPiece& key,
|
||||||
|
|
||||||
std::vector<CrashReporter::UploadReportResult>
|
std::vector<CrashReporter::UploadReportResult>
|
||||||
CrashReporterMac::GetUploadedReports(const std::string& product_name,
|
CrashReporterMac::GetUploadedReports(const std::string& product_name,
|
||||||
const std::string& temp_path) {
|
const std::string& temp_dir) {
|
||||||
std::vector<CrashReporter::UploadReportResult> uploaded_reports;
|
std::vector<CrashReporter::UploadReportResult> uploaded_reports;
|
||||||
|
|
||||||
base::FilePath file_path = GetCrashesDirectory(product_name, temp_path);
|
base::FilePath file_path = GetCrashesDirectory(product_name, temp_dir);
|
||||||
if (!base::PathExists(file_path)) {
|
if (!base::PathExists(file_path)) {
|
||||||
return uploaded_reports;
|
return uploaded_reports;
|
||||||
}
|
}
|
||||||
|
|
|
@ -149,7 +149,7 @@ void CrashReporterWin::InitBreakpad(const std::string& product_name,
|
||||||
const std::string& version,
|
const std::string& version,
|
||||||
const std::string& company_name,
|
const std::string& company_name,
|
||||||
const std::string& submit_url,
|
const std::string& submit_url,
|
||||||
const std::string& temp_path,
|
const std::string& temp_dir,
|
||||||
bool auto_submit,
|
bool auto_submit,
|
||||||
bool skip_system_crash_handler) {
|
bool skip_system_crash_handler) {
|
||||||
skip_system_crash_handler_ = skip_system_crash_handler;
|
skip_system_crash_handler_ = skip_system_crash_handler;
|
||||||
|
@ -172,7 +172,7 @@ void CrashReporterWin::InitBreakpad(const std::string& product_name,
|
||||||
breakpad_.reset();
|
breakpad_.reset();
|
||||||
|
|
||||||
breakpad_.reset(new google_breakpad::ExceptionHandler(
|
breakpad_.reset(new google_breakpad::ExceptionHandler(
|
||||||
temp_path,
|
temp_dir,
|
||||||
FilterCallback,
|
FilterCallback,
|
||||||
MinidumpCallback,
|
MinidumpCallback,
|
||||||
this,
|
this,
|
||||||
|
|
|
@ -27,7 +27,7 @@ class CrashReporterWin : public CrashReporter {
|
||||||
const std::string& version,
|
const std::string& version,
|
||||||
const std::string& company_name,
|
const std::string& company_name,
|
||||||
const std::string& submit_url,
|
const std::string& submit_url,
|
||||||
const std::string& temp_dir
|
const std::string& temp_dir,
|
||||||
bool auto_submit,
|
bool auto_submit,
|
||||||
bool skip_system_crash_handler) override;
|
bool skip_system_crash_handler) override;
|
||||||
void SetUploadParameters() override;
|
void SetUploadParameters() override;
|
||||||
|
|
|
@ -46,7 +46,7 @@ class CrashReporter {
|
||||||
const args = [
|
const args = [
|
||||||
'--reporter-url=' + submitURL,
|
'--reporter-url=' + submitURL,
|
||||||
'--application-name=' + this.productName,
|
'--application-name=' + this.productName,
|
||||||
'--crashes-directory=' + bindings._getCrashesDirectory(this.productName, this.tempDirectory),
|
'--crashes-directory=' + binding._getCrashesDirectory(this.productName, this.tempDirectory),
|
||||||
'--v=1'
|
'--v=1'
|
||||||
]
|
]
|
||||||
const env = {
|
const env = {
|
||||||
|
|
Loading…
Reference in a new issue