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

Always use atom-shell's verion when uploading crash report.

Browse source
This commit is contained in:
Cheng Zhao 2013-11-18 18:03:41 +08:00
parent aef6d44a01
commit 28b692aeaa
2 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
common/crash_reporter/crash_reporter.cc
View file

@ -25,21 +25,10 @@ void CrashReporter::Start(std::string product_name,
const std::string& submit_url, const std::string& submit_url,
bool auto_submit, bool auto_submit,
bool skip_system_crash_handler) { bool skip_system_crash_handler) {
std::string version; // Append "Renderer" for the renderer.
if (is_browser_) { product_name += " Renderer";
// Use application's version for crashes in browser. InitBreakpad(product_name, ATOM_VERSION_STRING, company_name, submit_url,
version = atom::Browser::Get()->GetVersion(); auto_submit, skip_system_crash_handler);
} else {
// Just use atom-shell's version in renderer, since we can not get
// application's version here.
version = ATOM_VERSION_STRING;
// Append "Renderer" for the renderer.
product_name += " Renderer";
}
InitBreakpad(product_name, version, company_name, submit_url, auto_submit,
skip_system_crash_handler);
} }
void CrashReporter::SetUploadParameters() { void CrashReporter::SetUploadParameters() {
@ -47,7 +36,6 @@ void CrashReporter::SetUploadParameters() {
std::string type = command.GetSwitchValueASCII(switches::kProcessType); std::string type = command.GetSwitchValueASCII(switches::kProcessType);
upload_parameters_["process_type"] = type; upload_parameters_["process_type"] = type;
upload_parameters_["atom_shell_version"] = ATOM_VERSION_STRING;
} }
} // namespace crash_reporter } // namespace crash_reporter

2
spec/api/crash-reporter.coffee
View file

@ -13,7 +13,7 @@ describe 'crash-reporter module', ->
server = http.createServer (req, res) -> server = http.createServer (req, res) ->
form = new formidable.IncomingForm() form = new formidable.IncomingForm()
form.parse req, (error, fields, files) -> form.parse req, (error, fields, files) ->
assert.equal fields['atom_shell_version'], process.versions['atom-shell'] assert.equal fields['ver'], process.versions['atom-shell']
assert.equal fields['process_type'], 'renderer' assert.equal fields['process_type'], 'renderer'
assert.equal files['upload_file_minidump']['name'], 'minidump.dmp' assert.equal files['upload_file_minidump']['name'], 'minidump.dmp'