Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

issue #157 - init ordering and error handling

Browse source 
reordering init so that settings are always loaded after the db is initialised
adding error handling to promises
This commit is contained in:
Hannah Wolfe 2013-06-16 17:14:01 +01:00
parent 382da5daf0
commit 0f0769ab2b
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/ghost.js
View file

@ -9,6 +9,7 @@
var config = require('./../config'),
when = require('when'),
express = require('express'),
errors = require('../core/shared/errorHandling'),
path = require('path'),
hbs = require('express-hbs'),
_ = require('underscore'),
@ -121,23 +122,21 @@
};
Ghost.prototype.init = function () {
var settings = {},
self = this,
configDeferred = when.defer(),
configPromise = configDeferred.promise;
var self = this;
models.Settings.findAll().then(function (result) {
_.map(result.models, function (member) {
if (!settings.hasOwnProperty(member.attributes.key)) {
settings[member.attributes.key] = member.attributes.value;
}
});
configDeferred.resolve(settings);
});
return when.all([instance.dataProvider.init(), instance.getPaths(), configPromise]).then(function (results) {
self.globalConfig = results[2];
return;
});
return when.join(instance.dataProvider.init(), instance.getPaths()).then(function () {
// TODO: this should use api.browse
return models.Settings.findAll().then(function (result) {
var settings = {};
_.map(result.models, function (member) {
if (!settings.hasOwnProperty(member.attributes.key)) {
settings[member.attributes.key] = member.attributes.value;
}
});
self.globalConfig = settings;
}, errors.logAndThrowError);
}, errors.logAndThrowError);
};
/**