Skip to content

Commit

Permalink
Merge branch 'master' into cleanup_nais
Browse files Browse the repository at this point in the history
  • Loading branch information
kenglxn authored Sep 1, 2023
2 parents f6b4074 + 3d27437 commit b7d1e4e
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 26 deletions.
34 changes: 17 additions & 17 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"homepage": "/min-side-arbeidsgiver",
"dependencies": {
"@navikt/aksel-icons": "^4.9.0",
"@navikt/arbeidsgiver-notifikasjon-widget": "6.3.8",
"@navikt/bedriftsmeny": "6.10.0",
"@navikt/arbeidsgiver-notifikasjon-widget": "6.3.9",
"@navikt/bedriftsmeny": "6.10.2",
"@navikt/ds-css": "^4.9.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "^4.9.0",
Expand Down
12 changes: 5 additions & 7 deletions server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@ const log_events_counter = new Prometheus.Counter({
labelNames: ['level'],
});

const maskFormat = format((info) => {
return {
...info,
message: info.message.replace(/\d{9,}/g, (match) => '*'.repeat(match.length)),
};
});
const maskFormat = format((info) => ({
...info,
message: info.message.replace(/\d{9,}/g, (match) => '*'.repeat(match.length)),
}));

// proxy calls to log.<level> https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy/Proxy/get
const log = new Proxy(
createLogger({
Expand Down Expand Up @@ -123,7 +122,6 @@ const main = async () => {
);
} else {
const proxyOptions = {
logLevel: PROXY_LOG_LEVEL,
logger: log,
on: {
error: (err, req, res) => {
Expand Down

0 comments on commit b7d1e4e

Please sign in to comment.