From 5da11ab6873b767b1c367c0e68258938ec54d56b Mon Sep 17 00:00:00 2001
From: Zach Hoffman <zrhoffman@apache.org>
Date: Mon, 29 Apr 2024 15:32:59 -0600
Subject: [PATCH] Move existing logs to the new log location, if they exist

---
 traffic_monitor/build/traffic_monitor.spec      | 16 ++++++++++++++++
 .../core/src/main/scripts/preinstall.sh         | 17 +++++++++++++++++
 traffic_router/tomcat-rpm/tomcat.spec           | 15 +++++++++++++++
 traffic_stats/build/traffic_stats.spec          | 16 ++++++++++++++++
 4 files changed, 64 insertions(+)

diff --git a/traffic_monitor/build/traffic_monitor.spec b/traffic_monitor/build/traffic_monitor.spec
index 792e4825aa..3dbc548393 100644
--- a/traffic_monitor/build/traffic_monitor.spec
+++ b/traffic_monitor/build/traffic_monitor.spec
@@ -66,6 +66,22 @@ cp "$src"/build/traffic_monitor.init       "${RPM_BUILD_ROOT}"/etc/init.d/traffi
 cp "$src"/build/traffic_monitor.logrotate  "${RPM_BUILD_ROOT}"/etc/logrotate.d/traffic_monitor
 
 %pre
+old_log_dir=/opt/traffic_monitor/var/log
+new_log_dir=/var/log/traffic_monitor
+if [[ -d "$old_log_dir" ]]; then
+	if [[ -d "$new_log_dir" ]]; then
+		(
+		# Include files starting with . in the * glob
+		shopt -s dotglob
+		mv "$old_log_dir"/* "$new_log_dir" || true
+		)
+		rmdir "$old_log_dir"
+	else
+		mv "$old_log_dir" "$new_log_dir"
+	fi
+	sync
+fi
+
 /usr/bin/getent group traffic_monitor >/dev/null
 if [ $? -ne 0 ]; then
 	/usr/sbin/groupadd -g 423 traffic_monitor
diff --git a/traffic_router/core/src/main/scripts/preinstall.sh b/traffic_router/core/src/main/scripts/preinstall.sh
index 89b540dff7..2905fdd005 100644
--- a/traffic_router/core/src/main/scripts/preinstall.sh
+++ b/traffic_router/core/src/main/scripts/preinstall.sh
@@ -13,6 +13,23 @@
 # limitations under the License.
 #
 
+set -o nounset
+old_log_dir=/opt/traffic_router/var/log
+new_log_dir=/var/log/traffic_router
+if [[ -d "$old_log_dir" ]]; then
+	if [[ -d "$new_log_dir" ]]; then
+		(
+		# Include files starting with . in the * glob
+		shopt -s dotglob
+		mv "$old_log_dir"/* "$new_log_dir" || true
+		)
+		rmdir "$old_log_dir"
+	else
+		mv "$old_log_dir" "$new_log_dir"
+	fi
+	sync
+fi
+
 # figure out which version of traffic_router is currently running
 # and then shut it down. Running both test just in case.
 set +e
diff --git a/traffic_router/tomcat-rpm/tomcat.spec b/traffic_router/tomcat-rpm/tomcat.spec
index 7d61634b64..653194a25f 100644
--- a/traffic_router/tomcat-rpm/tomcat.spec
+++ b/traffic_router/tomcat-rpm/tomcat.spec
@@ -70,6 +70,21 @@ if [ -d /opt/apache-tomcat-* ]; then
 fi
 
 %pre
+old_log_dir=/opt/tomcat/logs
+new_log_dir=/var/log/tomcat
+if [[ -d "$old_log_dir" ]]; then
+	if [[ -d "$new_log_dir" ]]; then
+		(
+		# Include files starting with . in the * glob
+		shopt -s dotglob
+		mv "$old_log_dir"/* "$new_log_dir" || true
+		)
+		rmdir "$old_log_dir"
+	else
+		mv "$old_log_dir" "$new_log_dir"
+	fi
+	sync
+fi
 
 %files
 %license LICENSE
diff --git a/traffic_stats/build/traffic_stats.spec b/traffic_stats/build/traffic_stats.spec
index f46109d5ab..8fe85afddb 100644
--- a/traffic_stats/build/traffic_stats.spec
+++ b/traffic_stats/build/traffic_stats.spec
@@ -83,6 +83,22 @@ cp "$src"/influxdb_tools/create_ts_databases  "${RPM_BUILD_ROOT}"/opt/traffic_st
 
 
 %pre
+old_log_dir=/opt/traffic_stats/var/log
+new_log_dir=/var/log/traffic_stats
+if [[ -d "$old_log_dir" ]]; then
+	if [[ -d "$new_log_dir" ]]; then
+		(
+		# Include files starting with . in the * glob
+		shopt -s dotglob
+		mv "$old_log_dir"/* "$new_log_dir" || true
+		)
+		rmdir "$old_log_dir"
+	else
+		mv "$old_log_dir" "$new_log_dir"
+	fi
+	sync
+fi
+
 /usr/bin/getent group traffic_stats >/dev/null
 
 if [ $? -ne 0 ]; then