tqt/Ghost
2
1
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2023-12-13 21:00:40 +01:00
Code Issues 1 Releases Wiki Activity

improvement: storage error handling (#7257)

Browse source 
no issue

- while testing different situations for custom storage adapters after switching from 0.9 to 0.10, it turned out the error output was not optimal
- this PR improves that
This commit is contained in:
Katharina Irrgang 2016-08-24 14:32:29 +02:00 committed by Hannah Wolfe
parent 6c199afedf
commit fb4a4817ef
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/server/storage/index.js
View file

@ -24,14 +24,27 @@ function getStorage(type) {
}
// CASE: load adapter from custom path (.../content/storage)
// CASE: load adapter from default path (.../server/storage)
try {
storage[storageChoice] = require(config.paths.storagePath.custom + storageChoice);
} catch (err1) {
try {
storage[storageChoice] = require(config.paths.storagePath.default + storageChoice);
} catch (err2) {
throw err2;
} catch (err) {
// CASE: only throw error if module does exist
if (err.code !== 'MODULE_NOT_FOUND') {
throw new errors.IncorrectUsage(err.message);
}
// CASE: if module not found it can be an error within the adapter (cannot find bluebird for example)
else if (err.code === 'MODULE_NOT_FOUND' && err.message.indexOf(config.paths.storagePath.custom + storageChoice) === -1) {
throw new errors.IncorrectUsage(err.message);
}
}
// CASE: either storage[storageChoice] is already set or why check for in the default storage path
try {
storage[storageChoice] = storage[storageChoice] || require(config.paths.storagePath.default + storageChoice);
} catch (err) {
if (err.code === 'MODULE_NOT_FOUND') {
throw new errors.IncorrectUsage('We cannot find your adpter in: ' + config.paths.storagePath.custom + ' or: ' + config.paths.storagePath.default);
} else {
throw new errors.IncorrectUsage(err.message);
}
}