From 96d568883e83e58049df712b7685b3232f29b8ee Mon Sep 17 00:00:00 2001
From: David Coutadeur <david.coutadeur@worteks.com>
Date: Thu, 19 Oct 2023 18:37:28 +0200
Subject: [PATCH] use a temporary log directory unless configured statically
 (#95)

---
 bin/lsc         | 24 +++++++++++++++++++++++-
 etc/logback.xml |  4 +++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/bin/lsc b/bin/lsc
index c20eea63..4ae001fb 100755
--- a/bin/lsc
+++ b/bin/lsc
@@ -59,10 +59,30 @@ fi
 
 CFG_DIR="$LSC_HOME/etc"
 LIB_DIR="$LSC_HOME/lib"
-LOG_DIR="/tmp"
+
+# Get logdir property from logback.xml
+logdir=$( grep 'property[ ]\+name="logdir"' "${CFG_DIR}/logback.xml" | sed -e 's/^.*value="\([^"]*\)".*$/\1/' )
+if [ "${logdir}" = "\${TMP_DIR}" ] || [ "${logdir}" = "\$TMP_DIR" ]; then
+	# Create temp directory
+	LOG_DIR="$( mktemp -d /tmp/lsc-$(date +%Y-%M-%d-%T).XXXXXXXXXX )"
+	echo "Using temporary log directory: ${LOG_DIR}"
+	# Pass LOG_DIR java system property with the temp directory value
+	JAVA_OPTS="${JAVA_OPTS} -DTMP_DIR=${LOG_DIR}"
+elif [ "${logdir}" = "" ]; then
+	echo "WARN: empty log dir in logback.xml, using LOG_DIR=/tmp"
+	LOG_DIR="/tmp"
+else
+	# Just use static value of logdir from logback.xml
+	LOG_DIR="${logdir}"
+	echo "Use static log directory: ${LOG_DIR}"
+fi
 LOG_FILE="$LOG_DIR/lsc.log"
 
+# Create LOG_DIR in case LOG_DIR has been defined statically above
 mkdir -p "$LOG_DIR"
+if [ ! -d ${LOG_DIR} ]; then
+	echo "ERROR: LOG_DIR ${LOG_DIR} does not exist!"
+fi
 
 PARAMETERS="$*"
 
@@ -178,6 +198,8 @@ then
 	log "LSC finished running"
 fi
 
+echo "LSC has used LOG_DIR=\"${LOG_DIR}\""
+
 #====================================================================
 # Exit
 #====================================================================
diff --git a/etc/logback.xml b/etc/logback.xml
index 462a4f93..c3818ded 100644
--- a/etc/logback.xml
+++ b/etc/logback.xml
@@ -2,7 +2,9 @@
 
 <configuration>
 
-	<property name="logdir" value="/tmp/lsc/log" />
+	<!-- logdir value can be set to a static directory path or to ${TMP_DIR} -->
+	<!-- ${TMP_DIR} is a temporary directory computed by bin/lsc and transmitted as a java system property -->
+	<property name="logdir" value="${TMP_DIR}" />
 
 	<!-- Standard output to console -->
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">