OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added version information to log lines

Browse Source 
refs https://github.com/TryGhost/Toolbox/issues/501

- this reverts commit 48dda23554
- also includes a resolution for `@elastic/elasticsearch` so we don't
  run a version that is potentially problematic - see referenced issue
  for context
This commit is contained in:
Daniel Lockyer 2023-01-20 12:51:03 +01:00
parent 40c280f6ac
commit 34fe49b110
No known key found for this signature in database
15 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/bootstrap-socket/package.json
View File

@ -22,6 +22,6 @@
"sinon": "14.0.2"
},
"dependencies": {
"@tryghost/logging": "2.3.6"
"@tryghost/logging": "2.4.0"
}
}

3
ghost/core/loggingrc.js
View File

@ -11,6 +11,9 @@ if (!loggingConfig.path) {
// Additional values used by logging
loggingConfig.env = config.get('env');
loggingConfig.domain = config.get('url');
loggingConfig.metadata = {
version: ghostVersion.original
};
// Config for metrics
loggingConfig.metrics = config.get('logging:metrics') || {};

5
ghost/core/package.json
View File

@ -97,7 +97,7 @@
"@tryghost/link-redirects": "0.0.0",
"@tryghost/link-replacer": "0.0.0",
"@tryghost/link-tracking": "0.0.0",
"@tryghost/logging": "2.3.6",
"@tryghost/logging": "2.4.0",
"@tryghost/magic-link": "0.0.0",
"@tryghost/mailgun-client": "0.0.0",
"@tryghost/member-attribution": "0.0.0",
@ -228,7 +228,8 @@
"toml": "3.0.0"
},
"resolutions": {
"@tryghost/logging": "2.3.6",
"@elastic/elasticsearch": "8.5.0",
"@tryghost/logging": "2.4.0",
"moment": "2.24.0",
"moment-timezone": "0.5.23"
}

2
ghost/domain-events/package.json
View File

@ -17,7 +17,7 @@
"lib"
],
"devDependencies": {
"@tryghost/logging": "2.3.6",
"@tryghost/logging": "2.4.0",
"c8": "7.12.0",
"mocha": "10.2.0",
"should": "13.2.3"

2
ghost/email-service/package.json
View File

@ -29,7 +29,7 @@
"@tryghost/errors": "1.2.20",
"@tryghost/html-to-plaintext": "0.0.0",
"@tryghost/kg-default-cards": "6.0.0",
"@tryghost/logging": "2.3.6",
"@tryghost/logging": "2.4.0",
"@tryghost/tpl": "0.1.21",
"bson-objectid": "2.0.4",
"cheerio": "0.22.0",

2
ghost/job-manager/package.json
View File

@ -27,7 +27,7 @@
"dependencies": {
"@breejs/later": "4.1.0",
"@tryghost/errors": "1.2.20",
"@tryghost/logging": "2.3.6",
"@tryghost/logging": "2.4.0",
"bree": "6.5.0",
"cron-validate": "1.4.5",
"fastq": "1.15.0",

2
ghost/mailgun-client/package.json
View File

@ -25,7 +25,7 @@
},
"dependencies": {
"@tryghost/debug": "0.1.21",
"@tryghost/logging": "2.3.6",
"@tryghost/logging": "2.4.0",
"@tryghost/metrics": "1.0.20",
"form-data": "4.0.0",
"lodash": "4.17.21",

2
ghost/members-api/package.json
View File

@ -30,7 +30,7 @@
"dependencies": {
"@tryghost/domain-events": "0.0.0",
"@tryghost/errors": "1.2.20",
"@tryghost/logging": "2.3.6",
"@tryghost/logging": "2.4.0",
"@tryghost/magic-link": "0.0.0",
"@tryghost/member-events": "0.0.0",
"@tryghost/members-payments": "0.0.0",

2
ghost/members-events-service/package.json
View File

@ -25,7 +25,7 @@
"dependencies": {
"@tryghost/domain-events": "0.0.0",
"@tryghost/errors": "1.2.20",
"@tryghost/logging": "2.3.6",
"@tryghost/logging": "2.4.0",
"@tryghost/member-events": "0.0.0",
"moment-timezone": "0.5.34"
}

2
ghost/members-importer/package.json
View File

@ -24,7 +24,7 @@
},
"dependencies": {
"@tryghost/errors": "1.2.20",
"@tryghost/logging": "2.3.6",
"@tryghost/logging": "2.4.0",
"@tryghost/members-csv": "0.0.0",
"@tryghost/tpl": "0.1.21",
"moment-timezone": "0.5.23"

2
ghost/oembed-service/package.json
View File

@ -23,7 +23,7 @@
},
"dependencies": {
"@tryghost/errors": "1.2.20",
"@tryghost/logging": "2.3.6",
"@tryghost/logging": "2.4.0",
"@tryghost/tpl": "0.1.21",
"charset": "1.0.1",
"cheerio": "0.22.0",

2
ghost/stripe/package.json
View File

@ -26,7 +26,7 @@
"@tryghost/debug": "0.1.21",
"@tryghost/domain-events": "0.0.0",
"@tryghost/errors": "1.2.20",
"@tryghost/logging": "2.3.6",
"@tryghost/logging": "2.4.0",
"@tryghost/member-events": "0.0.0",
"leaky-bucket": "2.2.0",
"lodash": "4.17.21",

2
ghost/update-check-service/package.json
View File

@ -25,7 +25,7 @@
"dependencies": {
"@tryghost/debug": "0.1.21",
"@tryghost/errors": "1.2.20",
"@tryghost/logging": "2.3.6",
"@tryghost/logging": "2.4.0",
"@tryghost/tpl": "0.1.21",
"lodash": "4.17.21",
"moment": "2.24.0"

3
package.json
View File

@ -36,7 +36,8 @@
"prepare": "husky install .github/hooks"
},
"resolutions": {
"@tryghost/logging": "2.3.6",
"@elastic/elasticsearch": "8.5.0",
"@tryghost/logging": "2.4.0",
"moment": "2.24.0",
"moment-timezone": "0.5.23"
},

47
yarn.lock
View File

@ -1951,7 +1951,7 @@
ee-log "^3.0.0"
section-tests "^1.3.0"
"@elastic/elasticsearch@8.5.0":
"@elastic/elasticsearch@8.5.0", "@elastic/elasticsearch@8.6.0":
version "8.5.0"
resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-8.5.0.tgz#407aee0950a082ee76735a567f2571cf4301d4ea"
integrity sha512-iOgr/3zQi84WmPhAplnK2W13R89VXD2oc6WhlQmH3bARQwmI+De23ZJKBEn7bvuG/AHMAqasPXX7uJIiJa2MqQ==
@ -4447,12 +4447,12 @@
"@tryghost/root-utils" "^0.3.19"
debug "^4.3.1"
"@tryghost/elasticsearch@^3.0.8":
version "3.0.8"
resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch/-/elasticsearch-3.0.8.tgz#cc39d7781140403c66b760233b87793a6cecb29a"
integrity sha512-CDLDsvwLMHVOorS19m2bUwSbHagDZR00Rc8x4yKhtpihetOXXdFbwRu/0eYjenTDZfd+94JeQAyoEwK9RsrHPg==
"@tryghost/elasticsearch@^3.0.8", "@tryghost/elasticsearch@^3.0.9":
version "3.0.9"
resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch/-/elasticsearch-3.0.9.tgz#e13db1f4b73c202389d4bd14ee5f20d8f5c6f6c1"
integrity sha512-b5qtQ7t976Y47G7yJShr5Rw/OPYdo1aQLzhb26VJXPQbF3ApadkuiFZP27YtApLm10MZzeTM/X+RLR0DSdvdtQ==
dependencies:
"@elastic/elasticsearch" "8.5.0"
"@elastic/elasticsearch" "8.6.0"
"@tryghost/debug" "^0.1.21"
split2 "4.1.0"
@ -4516,13 +4516,13 @@
resolved "https://registry.yarnpkg.com/@tryghost/http-cache-utils/-/http-cache-utils-0.1.6.tgz#893ffad3b03b29ef5a4ab72b6298e95f9d6a7a08"
integrity sha512-8j35Ixs5Ioa88cSKz2MaAILusuNa2cmbgt7b+XabwAyL3thxNZd6iaEyExPqqX6UOLkGJgO2e1oA5J+qeC7Ajg==
"@tryghost/http-stream@^0.1.16":
version "0.1.16"
resolved "https://registry.yarnpkg.com/@tryghost/http-stream/-/http-stream-0.1.16.tgz#4200cc785d39862f08b75d31b497d7f7af3a328e"
integrity sha512-/W60TawqGK2IN1tMCNH3V4SLMpMHeUMEyG7PQfZXpK2VZUXkD4Puyz/45C79J71uftSUlIDN7XtruBKxZRvB+w==
"@tryghost/http-stream@^0.1.17":
version "0.1.17"
resolved "https://registry.yarnpkg.com/@tryghost/http-stream/-/http-stream-0.1.17.tgz#3241ff2e1a403c052a3096855fc89f4d21c90d97"
integrity sha512-tcl8aRO47avrjoMneIKTlEakqsTHA8pFn1WNVH5nYC4cbgvkv0jOv4UgZ4NpwI2dbaRscfrgfsuq5KV5ZuvSiw==
dependencies:
"@tryghost/errors" "^1.2.20"
"@tryghost/request" "^0.1.34"
"@tryghost/request" "^0.1.35"
"@tryghost/image-transform@1.2.3":
version "1.2.3"
@ -4647,14 +4647,14 @@
lodash "^4.17.21"
luxon "^1.26.0"
"@tryghost/logging@2.3.6", "@tryghost/logging@^2.3.6":
version "2.3.6"
resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.3.6.tgz#7faab8f43bf934e2276c16d8e9bec638e930a355"
integrity sha512-PkxFwwlOgvn6hkkANYj6E/NZa8bJ82CbeNdSYd87FjgMNSuLXUcQuQSRbs/89ZF20NO1P4PUQTSs6cPoZHP54Q==
"@tryghost/logging@2.3.6", "@tryghost/logging@2.4.0", "@tryghost/logging@^2.3.6":
version "2.4.0"
resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.4.0.tgz#b6620ba3029b5d481d317a04eb5c578b0b13ae08"
integrity sha512-Q3y3gPHOGgijViCkuu2ARr4G++jnGDeafWD9JdPZO8CK6K3N20Dun3M7ujX3OY+u5UXhQTsMQw+nC5pjPRBRGg==
dependencies:
"@tryghost/bunyan-rotating-filestream" "^0.0.7"
"@tryghost/elasticsearch" "^3.0.8"
"@tryghost/http-stream" "^0.1.16"
"@tryghost/elasticsearch" "^3.0.9"
"@tryghost/http-stream" "^0.1.17"
"@tryghost/pretty-stream" "^0.1.15"
"@tryghost/root-utils" "^0.3.19"
bunyan "^1.8.15"
@ -4765,7 +4765,7 @@
resolved "https://registry.yarnpkg.com/@tryghost/promise/-/promise-0.2.1.tgz#78d922e6e9c99e52f472ff53cf4afd60049ee0f7"
integrity sha512-XfrwP69eXPM8ebIS/oWtprsox+ufV+n3R3+UsEN6OmijXm9wGZInX0dZ45gERbLDJOzbvyl1qvbGGt1fsFoynw==
"@tryghost/request@0.1.34", "@tryghost/request@^0.1.34":
"@tryghost/request@0.1.34":
version "0.1.34"
resolved "https://registry.yarnpkg.com/@tryghost/request/-/request-0.1.34.tgz#0fdd1e8cf5745244446507319346ffcf5dfc243d"
integrity sha512-DLAXDBqTHqEgUbeXEJ3/u+iqZXJp1gdLKuH5Ti9B6WVVVcMGUZeU7/JQS5NuSeJ0mwB8a83F2DIFMkEmFAebQw==
@ -4776,6 +4776,17 @@
got "9.6.0"
lodash "^4.17.21"
"@tryghost/request@^0.1.35":
version "0.1.35"
resolved "https://registry.yarnpkg.com/@tryghost/request/-/request-0.1.35.tgz#37d2091ef7e0b163d88ad36e00f141169f62f272"
integrity sha512-5++pw+E4CxdX1VdaM/xOuIv7WVHEr+Lr55zXCM9ijt4rKcQNVvSd8SQgE+mGVsWHiJnk5ZX2NnDNWpZTjzoZlg==
dependencies:
"@tryghost/errors" "^1.2.20"
"@tryghost/validator" "^0.2.0"
"@tryghost/version" "^0.1.19"
got "9.6.0"
lodash "^4.17.21"
"@tryghost/root-utils@0.3.19", "@tryghost/root-utils@^0.3.19":
version "0.3.19"
resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.3.19.tgz#714e67fdea080efc97d12f477b62cc89a66ade74"