Skip to content

Commit

Permalink
ta i bruk esm import nå som det er fikset i winston
Browse files Browse the repository at this point in the history
i tillegg:
- fjernet --experimental-modules flagget siden Dockerfile nå kjører med node:16
- bumpet prom api og client pga deprecation warning:
```
(node:22932) [DEP0152] DeprecationWarning: Custom PerformanceEntry accessors are deprecated. Please use the detail property.
    at PerformanceObserver.<anonymous> (.../node_modules/prom-client/lib/metrics/gc.js:42:38)
```

re:
- https://github.com/winstonjs/winston/releases/tag/v3.4.0
- winstonjs/winston#2006
  • Loading branch information
kenglxn committed Feb 2, 2022
1 parent dda2c0a commit aec195e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 23 deletions.
17 changes: 8 additions & 9 deletions server/package-lock.json

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

2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"jsdom": "^16.7.0",
"mustache-express": "^1.3.2",
"node-fetch": "^3.1.1",
"prom-client": "^12.0.0",
"prom-client": "^13.2.0",
"prometheus-api-metrics": "^3.2.0",
"winston": "3.4.0"
},
Expand Down
2 changes: 1 addition & 1 deletion server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import fetch from 'node-fetch';
import express from 'express';
import mustacheExpress from 'mustache-express';
import httpProxyMiddleware from "http-proxy-middleware";
import {createLogger, transports, format} from 'winston';
import jsdom from "jsdom";
import Prometheus from "prom-client";
import require from "./esm-require.js";

const {createLogger, transports, format} = require('winston');
const apiMetricsMiddleware = require('prometheus-api-metrics');
const {JSDOM} = jsdom;
const {createProxyMiddleware} = httpProxyMiddleware;
Expand Down
13 changes: 1 addition & 12 deletions server/start.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
#!/usr/bin/env sh

if test -d /var/run/secrets/nais.io/vault;
then
for FILE in /var/run/secrets/nais.io/vault/*.env
do
for line in $(cat $FILE); do
echo "- exporting `echo $line | cut -d '=' -f 1`"
export $line
done
done
fi

exec node --experimental-modules server.js
exec node server.js

0 comments on commit aec195e

Please sign in to comment.