From c1a61404a8fec051b00b6720987c73a4f75917a1 Mon Sep 17 00:00:00 2001
From: villadalmine <rino@atadata.com>
Date: Thu, 8 Sep 2016 12:25:22 -0300
Subject: [PATCH] Added more logic to scripts

---
 container_files/bin/apache-grouper.sh |  8 +++++---
 container_files/bin/check.sh          |  2 +-
 container_files/bin/tomcat-grouper.sh | 10 ++++++----
 container_files/conf/supervisord.conf |  8 ++++++--
 4 files changed, 18 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 container_files/bin/apache-grouper.sh

diff --git a/container_files/bin/apache-grouper.sh b/container_files/bin/apache-grouper.sh
old mode 100644
new mode 100755
index 95042b6a..08b12c6d
--- a/container_files/bin/apache-grouper.sh
+++ b/container_files/bin/apache-grouper.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
-
+log=/tmp/apache-supervisor.log
+date >> $log
 ps auxww |grep -iq start.sh
 statusstart=$?
 
 while [ "$statusstart" != 0 ]; do
 ps auxww |grep -iq start.sh
 statusstart=$?
-echo "First start configuration is in process, please wait"
+echo "First start configuration is in process, please wait" >> $log
 done
-echo "Starting Apache"
+echo "Starting Apache" >> $log
+date >> $log
 /usr/local/bin/httpd-shib-foreground
diff --git a/container_files/bin/check.sh b/container_files/bin/check.sh
index a25581de..77b79c88 100755
--- a/container_files/bin/check.sh
+++ b/container_files/bin/check.sh
@@ -12,4 +12,4 @@ echo "Adding Quickstart data" >> $log
 cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 bin/gsh.sh -xmlimportold GrouperSystem /opt/grouper/2.3.0/quickstart.xml -noprompt >> $log
 
 echo "Checking" >> $log
-cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 bin/gsh.sh -registry -check -noprompt >> $log
+cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 bin/gsh.sh -registry -check --noprompt >> $log
diff --git a/container_files/bin/tomcat-grouper.sh b/container_files/bin/tomcat-grouper.sh
index 5ae9fcbb..77fe2cf0 100755
--- a/container_files/bin/tomcat-grouper.sh
+++ b/container_files/bin/tomcat-grouper.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-
+log=/tmp/tomcat-apache-supervisor.log
+date >> $log
 ps auxww |grep -iq start.sh
 statusstart=$?
 ps auxww | grep -iq bin/httpd-shib-foreground
@@ -8,11 +9,12 @@ statusapache=$?
 while [ "$statusstart" != 0 ] && [ "$statusapache" == "0" ]; do
 ps auxww |grep -iq start.sh
 statusstart=$?
-echo "First start configuration is in process, please wait"
+echo "First start configuration is in process, please wait" >> $log
 ps auxww | grep -iq bin/httpd-shib-foreground
 statusapache=$?
-echo "Apache is not running, please wait"
+echo "Apache is not running, please wait" >> $log
 done
-echo "Starting Tomcat"
+echo "Starting Tomcat" >> $log
+date >> $log
 /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run
 
diff --git a/container_files/conf/supervisord.conf b/container_files/conf/supervisord.conf
index f3bff527..979f7e27 100644
--- a/container_files/conf/supervisord.conf
+++ b/container_files/conf/supervisord.conf
@@ -33,8 +33,8 @@ history_file=~/.sc_history  ; use readline history if available
 
 [program:configure]
 command=/bin/bash -c "exec /opt/bin/start.sh"
-tdout_logfile=/var/log/start_log
-stderr_logfile=/var/log/start_log
+tdout_logfile=/var/log/start_supervisor.log
+stderr_logfile=/var/log/start_error_supervisor.log
 autorestart=false
 autostart=true
 priority=1
@@ -42,6 +42,8 @@ startsec=30
 
 [program:apache]
 command=/bin/bash -c "exec /opt/bin/apache-grouper.sh"
+tdout_logfile=/var/log/apache_supervisor_log
+stderr_logfile=/var/log/apache_error_supervisor_log
 autostart=true
 autorestart=true
 priority=11
@@ -50,6 +52,8 @@ priority=11
 [program:tomcat]
 command=/bin/bash -c "exec /opt/bin/tomcat-grouper.sh"
 autorestart=true
+tdout_logfile=/var/log/tomcat_supervisor_log
+stderr_logfile=/var/log/tomcat_error_supervisor_log
 autostart=true
 priority=999
 startsec=10