From 48b02dfdc78a6412d568a14b015ccb9439a1dbb5 Mon Sep 17 00:00:00 2001
From: "Thomas Nelson (arthurdent3)" <nelson24@att.com>
Date: Wed, 2 Oct 2019 18:09:23 -0400
Subject: Update locking to use Threadsafe set

Had to create whole new method for Atomic Lock Creation.
Added thread safe set to contol lock creation per key.
Updated the deadlock to use local_quorum
Removed some uneeded import
Updated some logging.

Issue-ID: MUSIC-512
Signed-off-by: Thomas Nelson (arthurdent3) <nelson24@att.com>
Change-Id: I7e1a4c34de5dc9a0e90adf30d1f4d1bac698ceae
Signed-off-by: Thomas Nelson (arthurdent3) <nelson24@att.com>
---
 distribution/music/Dockerfile |  3 ++-
 distribution/music/startup.sh | 56 +++++++++++++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 16 deletions(-)

(limited to 'distribution')

diff --git a/distribution/music/Dockerfile b/distribution/music/Dockerfile
index 98e8ea41..9868ceee 100644
--- a/distribution/music/Dockerfile
+++ b/distribution/music/Dockerfile
@@ -23,10 +23,11 @@ FROM openjdk:8
 LABEL purpose="Springboot for MUSIC"
 RUN apt-get update && apt-get install -y netcat telnet vim vim-common curl
 RUN groupadd --gid 1000 music && useradd --gid 1000 --uid 1000 music
-RUN mkdir -p /opt/app/music/logs/MUSIC 
+RUN mkdir -p /opt/app/music/logs/MUSIC
 COPY MUSIC-SB.jar /opt/app/music
 COPY startup.sh /opt/app/music
 RUN mkdir -p /opt/app/music/logs && \
+    mkdir -p /opt/app/music/etc && \
     chown -R music:music /opt/app/music/ && \
     chmod 755 /opt/app/music/startup.sh
 USER music:music
diff --git a/distribution/music/startup.sh b/distribution/music/startup.sh
index 61536832..2e1165d1 100644
--- a/distribution/music/startup.sh
+++ b/distribution/music/startup.sh
@@ -8,35 +8,61 @@
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-# 
+#
 # ============LICENSE_END=============================================
 # ====================================================================
 
 echo "Running startup script to get password from certman"
 PWFILE=/opt/app/aafcertman/.password
 LOGFILE=/opt/app/music/logs/MUSIC/music-sb.log
-echo "PWFILE=${PWFILE}" >> $LOGFILE
+PROPS=/opt/app/music/etc/music-sb.properties
+LOGBACK=/opt/app/music/etc/logback.xml
+LOGGING=
+DEBUG_PROP=
+# Debug Setup. Uses env variables
+# DEBUG and DEBUG_PORT
+# DEBUG=true/false | DEBUG_PORT=<Port valie must be integer>
+if [ "${DEBUG}" == "true" ]; then
+  if [ "${DEBUG_PORT}" == "" ]; then
+    DEBUG_PORT=8000
+  fi
+  echo "Debug mode on"
+  DEBUG_PROP="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=${DEBUG_PORT},suspend=n"
+fi
+
+# LOGBACK file: if /opt/app/music/etc/logback.xml exists thenuse that.
+if [ -f $LOGBACK ]; then
+  LOGGING="--logging.config=file:${LOGBACK}"
+fi
+
+# Get Passwords from /opt/app/aafcertman
 if [ -f $PWFILE ]; then
-echo "Found ${PWFILE}" >> $LOGFILE
-PASSWORD=$(cat ${PWFILE})
-echo "#### Using Password from ${PWFILE} for Certs" >> ${LOGFILE}
+  echo "Found ${PWFILE}" >> $LOGFILE
+  PASSWORD=$(cat ${PWFILE})
+  echo "#### Using Password from ${PWFILE} for Certs" >> ${LOGFILE}
 else
-PASSWORD=changeit
-echo "#### Using Default Password for Certs" >> ${LOGFILE}
+  PASSWORD=changeit
+  echo "#### Using Default Password for Certs" >> ${LOGFILE}
 fi
-if [ ${EXTAP} ]; then
-    if [ "${EXTAP_FILE}" != "" ]; then
-        EXTAP_OPTION="--spring.config.location=file:${EXTAP_FILE}"
-    fi
+
+# If music-sb.properties exists in /opt/app/music/etc then use that to override the application.properties
+if [ -f $PROPS ]; then
+  # Run with different Property file
+  #echo "java ${DEBUG_PROP} -jar MUSIC.jar --spring.config.location=file:${PROPS} ${LOGGING} 2>&1 | tee ${LOGFILE}"
+  java ${DEBUG_PROP} -jar MUSIC-SB.jar --spring.config.location=file:${PROPS} ${LOGGING} 2>&1 | tee ${LOGFILE}
+else
+  #echo "java ${DEBUG_PROP} -jar MUSIC.jar --server.ssl.key-store-password=${PASSWORD} ${LOGGING} 2>&1 | tee ${LOGFILE}"
+  java ${DEBUG_PROP} -jar MUSIC-SB.jar --server.ssl.key-store-password="${PASSWORD}" ${LOGGING} 2>&1 | tee ${LOGFILE}
 fi
-echo "java -jar MUSIC-SB.jar ${EXTAP_OPTION} --server.ssl.key-store-password=${PASSWORD} --aaf_password=enc:${PASSWORD} 2>&1 | tee ${LOGFILE}"
-java -jar MUSIC-SB.jar ${EXTAP_OPTION} --server.ssl.key-store-password="${PASSWORD}" --aaf_password="enc:${PASSWORD}" 2>&1 | tee ${LOGFILE}
+
+
+
 
-- 
cgit 1.2.3-korg