Skip to content
This repository has been archived by the owner on Jul 26, 2022. It is now read-only.

refactor(logger): update to support pino@7 #445

Merged
merged 4 commits into from
Jul 22, 2020
Merged

refactor(logger): update to support pino@7 #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aad1c3b
refactor(logger): update to support pino@7
JacopoDaeli Jul 21, 2020
7fc1390
update PINO
JacopoDaeli Jul 21, 2020
cbe93e4
lint
JacopoDaeli Jul 21, 2020
1c87ba1
make it nicer
JacopoDaeli Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions charts/kubernetes-external-secrets/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ env:
AWS_DEFAULT_REGION: us-west-2
POLLER_INTERVAL_MILLISECONDS: 10000 # Caution, setting this frequency may incur additional charges on some platforms
LOG_LEVEL: info
LOG_MESSAGE_KEY: 'msg'
# Print logs level as string ("info") rather than integer (30)
# USE_HUMAN_READABLE_LOG_LEVELS: true
METRICS_PORT: 3001
Expand Down
4 changes: 3 additions & 1 deletion config/environment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const pollerIntervalMilliseconds = process.env.POLLER_INTERVAL_MILLISECONDS

const logLevel = process.env.LOG_LEVEL || 'info'
const useHumanReadableLogLevels = 'USE_HUMAN_READABLE_LOG_LEVELS' in process.env
const logMessageKey = 'LOG_MESSAGE_KEY' in process.env

const pollingDisabled = 'DISABLE_POLLING' in process.env

Expand All @@ -46,5 +47,6 @@ module.exports = {
pollingDisabled,
logLevel,
customResourceManagerDisabled,
useHumanReadableLogLevels
useHumanReadableLogLevels,
logMessageKey
}
9 changes: 7 additions & 2 deletions config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,15 @@ const kubeClient = new kube.Client({ backend: kubeBackend })

const logger = pino({
serializers: {
err: pino.stdSerializers.err
err: pino.stdSerializers.err,
messageKey: envConfig.logMessageKey || 'msg'
},
level: envConfig.logLevel,
useLevelLabels: envConfig.useHumanReadableLogLevels
formatters: {
level (label, number) {
return { level: envConfig.useHumanReadableLogLevels ? label : number }
}
}
})

const customResourceManager = new CustomResourceManager({
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"lodash.merge": "^4.6.2",
"make-promises-safe": "^5.1.0",
"node-vault": "^0.9.18",
"pino": "^6.0.0",
"pino": "^6.4.1",
"prom-client": "^12.0.0"
},
"devDependencies": {
Expand Down