Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 959130 - Stop using OS.File for startup read in CrashMonitor.jsm. r=ttaubert

Browse Source
This commit is contained in:
Steven MacLeod 2014-02-03 15:14:16 +01:00
parent 61cd0fa16b
commit 29c4fc85fd
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
toolkit/components/crashmonitor/CrashMonitor.jsm
View File

@ -34,12 +34,15 @@
this.EXPORTED_SYMBOLS = [ "CrashMonitor" ];
const Cu = Components.utils;
const Cr = Components.results;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/osfile.jsm");
Cu.import("resource://gre/modules/Promise.jsm");
Cu.import("resource://gre/modules/Task.jsm");
Cu.import("resource://gre/modules/AsyncShutdown.jsm");
Cu.import("resource://gre/modules/NetUtil.jsm");
Cu.import("resource://gre/modules/FileUtils.jsm");
const NOTIFICATIONS = [
"final-ui-startup",
@ -93,25 +96,42 @@ let CrashMonitorInternal = {
* @return {Promise} A promise that resolves/rejects once loading is complete
*/
loadPreviousCheckpoints: function () {
let promise = Task.spawn(function () {
let notifications;
try {
let decoder = new TextDecoder();
let data = yield OS.File.read(CrashMonitorInternal.path);
let contents = decoder.decode(data);
notifications = JSON.parse(contents);
} catch (ex if ex instanceof OS.File.Error && ex.becauseNoSuchFile) {
// If checkpoint file cannot be read
throw new Task.Result(null);
} catch (ex) {
Cu.reportError("Error while loading crash monitor data: " + ex);
throw new Task.Result(null);
let deferred = Promise.defer();
CrashMonitorInternal.previousCheckpoints = deferred.promise;
let file = FileUtils.File(CrashMonitorInternal.path);
NetUtil.asyncFetch(file, function(inputStream, status) {
if (!Components.isSuccessCode(status)) {
if (status != Cr.NS_ERROR_FILE_NOT_FOUND) {
Cu.reportError("Error while loading crash monitor data: " + status);
}
deferred.resolve(null);
return;
}
let data = NetUtil.readInputStreamToString(inputStream,
inputStream.available(), { charset: "UTF-8" });
let notifications = null;
try {
notifications = JSON.parse(data);
} catch (ex) {
Cu.reportError("Error while parsing crash monitor data: " + ex);
deferred.resolve(null);
}
try {
deferred.resolve(Object.freeze(notifications));
} catch (ex) {
// The only exception we reject from is if notifications is not
// an object. This happens when the checkpoints file contained
// just a numeric string.
deferred.reject(ex);
}
throw new Task.Result(Object.freeze(notifications));
});
CrashMonitorInternal.previousCheckpoints = promise;
return promise;
return deferred.promise;
}
};