Merge 7d5c119 into e3e360f

Fdawgs · Mar 15, 2021 · 1ba4a75 · 1ba4a75
2 parents e3e360f + 7d5c119
commit 1ba4a75
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "lint:prettier": "prettier . --write --ignore-unknown",
     "lint:prettier:ci": "prettier . --check --ignore-unknown",
     "start": "node .",
-    "start:dev": "nodemon | pino-pretty --colorize",
+    "start:dev": "nodemon",
     "test": "npm run lint && npm run jest"
   },
   "commitlint": {

diff --git a/src/config/index.js b/src/config/index.js
@@ -168,6 +168,15 @@ async function getConfig() {
 		});
 	}
 
+	/**
+	 * Pretty output to stdout out if not in production.
+	 * Replaces using `pino-pretty` in scripts, as it does not play
+	 * well with Nodemon
+	 */
+	if (env.NODE_ENV !== "PRODUCTION" && !env.LOG_ROTATION_FILENAME) {
+		config.fastifyInit.logger.prettyPrint = true;
+	}
+
 	if (env.AUTH_BEARER_TOKEN_ARRAY) {
 		const keys = new Set();
 		JSON.parse(env.AUTH_BEARER_TOKEN_ARRAY).forEach((element) => {