From c0da51eb9097be259796fa172952c4f3e587bba6 Mon Sep 17 00:00:00 2001
From: Rowan Manning <accounts+github@rowanmanning.com>
Date: Fri, 8 Jul 2022 10:31:22 +0100
Subject: [PATCH] Refactor to simplify logic and reduce repetition

---
 src/main.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main.js b/src/main.js
index b37233e..6ccef46 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,19 +9,15 @@ const getLogger = () => {
 		// app environment - use Winston
 
 		// Determine whether the app is using Heroku log drains or Splunk HEC
-		const useHerokuLogDrains = process.env.MIGRATE_TO_HEROKU_LOG_DRAINS;
+		const useHerokuLogDrains = Boolean(process.env.MIGRATE_TO_HEROKU_LOG_DRAINS);
 		const splunkToken = process.env.SPLUNK_HEC_TOKEN;
 
 		// Determine the log level
-		let logLevel = 'silly';
-		if (useHerokuLogDrains) {
-			logLevel = process.env.SPLUNK_LOG_LEVEL || 'warn';
-		} else {
-			logLevel = process.env.CONSOLE_LOG_LEVEL || 'silly';
-		}
+		const splunkLogLevel = process.env.SPLUNK_LOG_LEVEL || 'warn';
+		const consoleLogLevel = process.env.CONSOLE_LOG_LEVEL || 'silly';
 
 		const logger = new AppLogger({
-			level: logLevel,
+			level: (useHerokuLogDrains ? splunkLogLevel : consoleLogLevel),
 			colorize: process.env.CONSOLE_LOG_UNCOLORIZED !== 'true',
 
 			// If we're migrating to Heroku log drains then we want
@@ -32,7 +28,7 @@ const getLogger = () => {
 		// If we have a Splunk token and we're not using log drains,
 		// then add a Splunk HEC transport to the logger
 		if (splunkToken && !useHerokuLogDrains) {
-			logger.addSplunkHEC(process.env.SPLUNK_LOG_LEVEL || 'warn');
+			logger.addSplunkHEC(splunkLogLevel);
 		}
 
 		return logger;