diff --git a/.env.defaults b/.env.defaults index 9ceeea3e687a5a6b067eff7638243911e4b0fd3b..1e9c2b08fd252dec621e13ac9284c588337f6c87 100644 --- a/.env.defaults +++ b/.env.defaults @@ -1,3 +1,3 @@ CACHE_TTL=30000 PORT=8080 -MANIFEST_URLS= +LOG_LEVEL=info diff --git a/README.md b/README.md index 899ece8606159f39384fe09a528ddd7753b85166..4743a101e9f9569a145b76643953d7313c7ecd85 100644 --- a/README.md +++ b/README.md @@ -34,9 +34,13 @@ helm upgrade -i -f manifest-service/values.yaml -f values/develop.yaml manifest- | Parameter | Description | Default | |-----------------|---------------------------------|----------| | `PORT` | Exposed port | `"8080"` | +| `CACHE_TTL` | Vite manifest caching time | `30000` | +| `LOG_LEVEL` | Pino log level | `"info"` | **kubernetes** | Parameter | Description | Default | |----------------|---------------------------------|----------| | `port` | Exposed port | `"8080"` | +| `cacheTTL` | Vite manifest caching time | `30000` | +| `logLevel` | Pino log level | `"info"` | diff --git a/helm/core-manifest-service/templates/deployment.yaml b/helm/core-manifest-service/templates/deployment.yaml index 9ceeebb411576bbabb90630d00ce3bfe458edae6..afd15251bb7e8a28e72347b28790f7d1853a9abf 100644 --- a/helm/core-manifest-service/templates/deployment.yaml +++ b/helm/core-manifest-service/templates/deployment.yaml @@ -40,6 +40,8 @@ spec: env: - name: CACHE_TTL value: "{{ .Values.cacheTTL | int }}" + - name: LOG_LEVEL + value: "{{ .Values.logLevel }}" ports: - name: http containerPort: {{ .Values.containerPort | default 8080 }} diff --git a/helm/core-manifest-service/values.yaml b/helm/core-manifest-service/values.yaml index b8ede247202699e361270fa4678e0968f3e7e79f..b61318334fad37b5561ef6a943a52b2bac24ffaf 100644 --- a/helm/core-manifest-service/values.yaml +++ b/helm/core-manifest-service/values.yaml @@ -85,3 +85,4 @@ affinity: {} # service specific configuration cacheTTL: 30000 +logLevel: info diff --git a/package.json b/package.json index a237d86bc05788738c8dd66ab6560327a7b89589..9eefad71346eaadc094d74475bd1a8c878008fd3 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "start": "node src/index.js", "dev": "nodemon index.js | pino-pretty", "prepare": "husky install", - "test": "NODE_OPTIONS=--experimental-vm-modules jest --no-cache" + "test": "LOG_LEVEL=error NODE_OPTIONS=--experimental-vm-modules jest --no-cache" }, "author": "Open-Xchange", "license": "CC-BY-NC-SA-2.5", diff --git a/src/logger.js b/src/logger.js index 54f3154ad5a52bcf754e1ab2923088d48ee76fe4..2d6267c83f8f41a79866b6ab28bbc7270dd83c8c 100644 --- a/src/logger.js +++ b/src/logger.js @@ -1,4 +1,6 @@ // Very low overhead Node.js logger. Logs in json use pino-pretty for dev. import Logger from 'pino' -export const logger = new Logger() +export const logger = new Logger({ + level: process.env.LOG_LEVEL +})