From 979acc748b8e18c44f9b94aa84338915c01e161f Mon Sep 17 00:00:00 2001
From: Richard Petersen <richard.petersen@open-xchange.com>
Date: Tue, 7 Sep 2021 16:52:48 +0200
Subject: [PATCH] Introduce loglevel variable and reduce loglevel for tests
---
.env.defaults | 2 +-
README.md | 4 ++++
helm/core-manifest-service/templates/deployment.yaml | 2 ++
helm/core-manifest-service/values.yaml | 1 +
package.json | 2 +-
src/logger.js | 4 +++-
6 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.env.defaults b/.env.defaults
index 9ceeea3..1e9c2b0 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 899ece8..4743a10 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 9ceeebb..afd1525 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 b8ede24..b613183 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 a237d86..9eefad7 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 54f3154..2d6267c 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
+})
--
GitLab