Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ta i bruk esm import nå som det er fikset i winston #1116

Merged
merged 2 commits into from
Feb 2, 2022
Merged

ta i bruk esm import nå som det er fikset i winston #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e387742
ta i bruk esm import nå som det er fikset i winston
kenglxn Feb 1, 2022
89db15e
Merge branch 'master' into winston_esm_import
kenglxn Feb 2, 2022
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
19 changes: 9 additions & 10 deletions server/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.

4 changes: 2 additions & 2 deletions server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"jsonwebtoken": "^8.5.1",
"mustache-express": "^1.3.2",
"node-fetch": "^3.1.1",
"prom-client": "^12.0.0",
"prometheus-api-metrics": "^3.1.0",
"prom-client": "^13.2.0",
"prometheus-api-metrics": "^3.2.0",
"winston": "3.4.0"
},
"scripts": {
Expand Down
5 changes: 2 additions & 3 deletions server/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import mustacheExpress from 'mustache-express';
import httpProxyMiddleware from 'http-proxy-middleware';
import jsdom from 'jsdom';
import Prometheus from 'prom-client';
import require from './esm-require.js';
import { createLogger, transports, format } from 'winston';
import cookieParser from 'cookie-parser';
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 All @@ -23,7 +23,6 @@ const {
DECORATOR_EXTERNAL_URL = defaultDecoratorUrl,
NAIS_CLUSTER_NAME = 'local',
API_GATEWAY = 'http://localhost:8080',
BRUKER_API_URL = 'http://localhost:8081',
DECORATOR_UPDATE_MS = 30 * 60 * 1000,
PROXY_LOG_LEVEL = 'info',
ARBEIDSFORHOLD_DOMAIN = 'http://localhost:8080',
Expand Down
2 changes: 1 addition & 1 deletion server/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env sh

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