tqt
/
Ghost
mirror of https://github.com/TryGhost/Ghost.git
2
1
Fork 0
Code Issues 1 Releases Wiki Activity

Bumped ghost-ignition version to 3.1.0 

no issue

Bumped ghost ignition to 3.1.0 to have unified logging for all versions on Ghost Pro
This commit is contained in:
Rish 2019-05-28 07:52:04 +05:30 committed by Rishabh Garg
parent a391a3becf
commit 855a7cdf06
6 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/server/data/validation/index.js
View File

@ -372,7 +372,7 @@ validateRedirects = function validateRedirects(redirects) {
if (!redirect.from || !redirect.to) {
throw new common.errors.ValidationError({
message: common.i18n.t('errors.utils.redirectsWrongFormat'),
context: JSON.stringify(redirect),
context: redirect,
help: 'https://docs.ghost.org/v1/docs/redirects'
});
}

2
core/server/lib/common/logging.js
View File

@ -2,12 +2,14 @@ var config = require('../../config'),
logging = require('ghost-ignition').logging;
module.exports = logging({
name: config.get('logging:name'),
env: config.get('env'),
path: config.get('logging:path') || config.getContentPath('logs'),
domain: config.get('url'),
mode: config.get('logging:mode'),
level: config.get('logging:level'),
transports: config.get('logging:transports'),
gelf: config.get('logging:gelf'),
loggly: config.get('logging:loggly'),
rotation: config.get('logging:rotation')
});

4
core/server/models/plugins/collision.js
View File

@ -60,11 +60,11 @@ module.exports = function (Bookshelf) {
message: 'Saving failed! Someone else is editing this post.',
code: 'UPDATE_COLLISION',
level: 'critical',
context: JSON.stringify({
context: {
clientUpdatedAt: self.clientData.updated_at,
serverUpdatedAt: self.serverData.updated_at,
changed: changed
})
}
}));
}
}

4
core/server/services/themes/index.js
View File

@ -36,7 +36,7 @@ module.exports = {
common.logging.warn(new common.errors.ThemeValidationError({
errorType: 'ThemeWorksButHasErrors',
message: common.i18n.t('errors.middleware.themehandler.themeHasErrors', {theme: activeThemeName}),
errorDetails: JSON.stringify(checkedTheme.results.error, null, '\t')
errorDetails: checkedTheme.results.error
}));
}
@ -47,7 +47,7 @@ module.exports = {
if (err.errorDetails) {
common.logging.error(new common.errors.ThemeValidationError({
message: common.i18n.t('errors.middleware.themehandler.invalidTheme', {theme: activeThemeName}),
errorDetails: JSON.stringify(err.errorDetails, null, '\t')
errorDetails: err.errorDetails
}));
}

2
package.json
View File

@ -54,7 +54,7 @@
"extract-zip": "1.6.7",
"fs-extra": "3.0.1",
"ghost-gql": "0.0.10",
"ghost-ignition": "2.9.4",
"ghost-ignition": "3.1.0",
"ghost-storage-base": "0.0.3",
"glob": "5.0.15",
"got": "7.1.0",

34
yarn.lock
View File

@ -1269,6 +1269,13 @@ debug@3.1.0, debug@^3.1.0:
dependencies:
ms "2.0.0"
debug@^4.0.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
dependencies:
ms "^2.1.1"
decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@ -2081,6 +2088,18 @@ gaze@^1.1.0:
dependencies:
globule "^1.0.0"
gelf-stream@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/gelf-stream/-/gelf-stream-1.1.1.tgz#9cea9b6386ac301c741838ca3cb91e66dbfbf669"
integrity sha1-nOqbY4asMBx0GDjKPLkeZtv79mk=
dependencies:
gelfling "^0.3.0"
gelfling@^0.3.0:
version "0.3.1"
resolved "https://registry.yarnpkg.com/gelfling/-/gelfling-0.3.1.tgz#336a98f81510f9ae0af2a494e17468a116a9dc04"
integrity sha1-M2qY+BUQ+a4K8qSU4XRooRap3AQ=
generate-function@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-1.1.0.tgz#54c21b080192b16d9877779c5bb81666e772365f"
@ -2146,16 +2165,18 @@ ghost-ignition@2.9.2:
prettyjson "^1.1.3"
uuid "^3.0.0"
ghost-ignition@2.9.4:
version "2.9.4"
resolved "https://registry.yarnpkg.com/ghost-ignition/-/ghost-ignition-2.9.4.tgz#068359a3d5b98f43666e42220afc8a61ccb1e85e"
ghost-ignition@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/ghost-ignition/-/ghost-ignition-3.1.0.tgz#4a0d7f0a15e54fbc0e16d398da62ff68737e4e23"
integrity sha512-ae0r/yBJDo9SkeLfy0ecrHVqO0gt9l07wiCOWmdzdvbmoU24AB881PjymnM/DLP9SY6E33mLYtT8K3ximgieLg==
dependencies:
bunyan "1.8.12"
bunyan-loggly "^1.3.1"
caller "1.0.1"
debug "^2.6.9"
debug "^4.0.0"
find-root "1.1.0"
fs-extra "^3.0.1"
gelf-stream "^1.1.1"
json-stringify-safe "^5.0.1"
lodash "^4.16.4"
moment "^2.15.2"
@ -3911,6 +3932,11 @@ ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
ms@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
multer@1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/multer/-/multer-1.3.1.tgz#c3fb3b35f50c7eefe873532f90d3dde02ce6e040"