eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 22:43:57 +00:00
Code Activity

add /internal-server-status to 001-events.conf; always launch httpd

Browse Source
This commit is contained in:
EC2 Server committed 2015-06-30 16:29:08 +00:00
1 parent f941a0dd1e
commit bf4cac1f1a
2 files changed
+23 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

configuration/sailing
+17 -11
View File
@@ -12,6 +12,9 @@ RETVAL=0
JAVA_START_INSTANCES="server"
GIT_REPOSITORY=/home/sailing/code
APACHE_CONFIG_DIR=/etc/httpd/conf.d
rm /var/log/sailing.out
rm /var/log/sailing.err
start_tmux() {
su - sailing -c "/home/sailing/bin/tmuxConsole.sh unattended"
@@ -29,9 +32,14 @@ start_servers() {
(
# execute env.sh in a subshell which now has the same set of variables that the server will see
source /home/sailing/servers/$conf/env.sh
# Append Apache macro invocation for /internal-server-status based on mod_status and INSTANCE_DNS to /etc/httpd/conf.d/001-events.conf
echo "Appending macro usage for /internal-server-status URL for mod_status based Apache monitoring to $APACHE_CONFIG_DIR/001-events.conf"
echo "Use Status $INSTANCE_DNS internal-server-status" >>$APACHE_CONFIG_DIR/001-events.conf
launch_httpd
echo "Starting Java server $conf"
su - sailing -c "cd /home/sailing/servers/$conf && ./start" 2>/var/log/sailing.err >/var/log/sailing.out
su - sailing -c "cd /home/sailing/servers/$conf && ./start" 2>>/var/log/sailing.err >>/var/log/sailing.out
# terminating the subshell will forget all the variable assignments brought in by env.sh, clearing for the next server instance
)
RETVAL=$?
@@ -50,16 +58,14 @@ stop_servers() {
# launch_httpd(server_name, port, event_id)
launch_httpd() {
if [ "$REPLICATE_ON_START" != "" ]; then
echo "REPLICATE_ON_START is $REPLICATE_ON_START. Will try to launch httpd so this replica can work with an ELB easily."
if [ -x /etc/init.d/httpd ]; then
server_name="`echo $SERVER_NAME | tr [A-Z] [a-z]`"
echo "Use Event $server_name.sapsailing.com \"$EVENT_ID\" 127.0.0.1 $SERVER_PORT" >>/etc/httpd/conf.d/001-events.conf
echo "Launching httpd to map ${server_name}.sapsailing.com to event with ID $EVENT_ID with server running on local port $SERVER_PORT..."
service httpd start
else
echo Can't launch httpd; start script doesn't seem to be installed at /etc/init.d/httpd
fi
echo "Will try to launch httpd so this replica can work with an ELB easily."
if [ -x /etc/init.d/httpd ]; then
server_name="`echo $SERVER_NAME | tr [A-Z] [a-z]`"
echo "Use Event $server_name.sapsailing.com \"$EVENT_ID\" 127.0.0.1 $SERVER_PORT" >>$APACHE_CONFIG_DIR/001-events.conf
echo "Launching httpd to map ${server_name}.sapsailing.com to event with ID $EVENT_ID with server running on local port $SERVER_PORT..."
service httpd start
else
echo Can't launch httpd; start script doesn't seem to be installed at /etc/init.d/httpd
fi
}
java/target/refreshInstance.sh
+6 -2
View File
@@ -246,12 +246,16 @@ if [[ $OPERATION == "auto-install" ]]; then
activate_user_data
# then download and install environment and append to env.sh
install_environment
# finally, append user data to env.sh as it shall take precedence over the installed environment's defaults
append_user_data_to_envsh
# finally, append user data to env.sh as it shall take precedence over the installed environment's defaults
append_user_data_to_envsh
# make sure to reload data
source `pwd`/env.sh
# Append Apache macro invocation for /internal-server-status based on mod_status and INSTANCE_DNS to /etc/httpd/conf.d/001-events.conf
APACHE_CONFIG_DIR=/etc/httpd/conf.d
echo "Appending macro usage for /internal-server-status URL for mod_status based Apache monitoring to $APACHE_CONFIG_DIR/001-events.conf"
echo "Use Status $INSTANCE_DNS internal-server-status" >>$APACHE_CONFIG_DIR/001-events.conf
if [[ $INSTALL_FROM_RELEASE == "" ]] && [[ $BUILD_BEFORE_START != "True" ]]; then
echo "I could not find any option telling me to download a release or to build! Possible cause: Your environment contains empty values for these variables!"