Merge pull request #103 from OpenVoxProject/javafoo

Remove wrapper scripts to start Java directly via systemd & switch forking->notify-reload

Author: bastelfreak

resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache

@@ -41,11 +41,9 @@ templates:
   - ext/debian/postinst.erb
   - ext/config/user/conf.d/*.erb
   - ext/bin/*.erb
-  - ext/cli/apps/*.erb
   - ext/cli/*.erb
   - ext/cli_defaults/*.erb
   - ext/default.erb
-  - ext/ezbake-functions.sh.erb
   - install.sh.erb
   - controller.sh.erb
 tar_excludes:

resources/puppetlabs/lein-ezbake/template/foss/ext/default.erb

@@ -2,7 +2,7 @@
 # Init settings for <%= EZBake::Config[:project] %>
 ###########################################
 
-# Location of your Java binary
+# used by openvox-server CLI apps, not by the systemd unit
 JAVA_BIN="<%= EZBake::Config[:java_bin] %>"
 
 # Modify this if you'd like to change the memory allocation, enable JMX, etc

resources/puppetlabs/lein-ezbake/template/global/ext/cli/foreground.erb

@@ -1,37 +1,27 @@
 #!/usr/bin/env bash
 
-restartfile="/opt/puppetlabs/server/data/<%= EZBake::Config[:real_name] %>/restartcounter"
-cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh
+# This file is meant to be used in containers to start the java process with correct parameters
 
-if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then
-    echo "Unable to find ${INSTALL_DIR}/ezbake-functions.sh script, failing start." 1>&2
-    exit 1
-fi
-
-. "${INSTALL_DIR}/ezbake-functions.sh"
-
-init_restart_file "$restartfile" || exit $?
-
-if !(echo "${@}" | grep -e "--debug" -q)
+if ! (echo "${@}" | grep -e "--debug" -q)
 then
     LOG_APPENDER="-Dlogappender=STDOUT"
 fi
 
 CLASSPATH="${INSTALL_DIR}/<%= EZBake::Config[:uberjar_name] %>"
 
+cli_defaults="${INSTALL_DIR}/cli/cli-defaults.sh"
 if [ -e "$cli_defaults" ]; then
-  . $cli_defaults
+  . "$cli_defaults"
   if [ $? -ne 0 ]; then
     echo "Unable to initialize cli defaults, failing start." 1>&2
     exit 1
   fi
 fi
 
 COMMAND="${JAVA_BIN} ${JAVA_ARGS} ${LOG_APPENDER} \
-         -cp "$CLASSPATH" \
+         -cp '${CLASSPATH}' \
          clojure.main -m <%= EZBake::Config[:main_namespace] %> \
          --config ${CONFIG} --bootstrap-config ${BOOTSTRAP_CONFIG} \
-         --restart-file "${restartfile}" \
          ${TK_ARGS} \
          ${@}"
 

resources/puppetlabs/lein-ezbake/template/global/ext/cli/reload.erb

@@ -19,14 +19,15 @@ Wants=<%= EZBake::Config[:start_after].map {|dep| "#{dep}.service" }.join(" ") %
 <% end -%>
 
 [Service]
-Type=forking
+Type=notify-reload
+LogsDirectory=puppetlabs/<%= EZBake::Config[:real_name] %>
+RuntimeDirectory=puppetlabs/<%= EZBake::Config[:real_name] %>
 EnvironmentFile=/etc/default/<%= EZBake::Config[:project] %>
 User=<%= EZBake::Config[:user] %>
 TimeoutStartSec=<%= EZBake::Config[:start_timeout] %>
 TimeoutStopSec=<%= EZBake::Config[:stop_timeout] %>
 Restart=on-failure
 StartLimitBurst=5
-PIDFile=/run/puppetlabs/<%= EZBake::Config[:real_name] %>/<%= EZBake::Config[:real_name] %>.pid
 PrivateTmp=true
 
 # https://tickets.puppetlabs.com/browse/EZ-129
@@ -50,15 +51,22 @@ ExecStartPre=<%= action %>
 <% end -%>
 <% end -%>
 
-ExecReload=/opt/puppetlabs/server/apps/<%= EZBake::Config[:real_name] %>/bin/<%= EZBake::Config[:real_name] %> reload
-ExecStart=/opt/puppetlabs/server/apps/<%= EZBake::Config[:real_name] %>/bin/<%= EZBake::Config[:real_name] %> start
-ExecStop=/opt/puppetlabs/server/apps/<%= EZBake::Config[:real_name] %>/bin/<%= EZBake::Config[:real_name] %> stop
+ExecStart=<%= EZBake::Config[:java_bin] %> $JAVA_ARGS $LOG_APPENDER -Dlogappender=F1 \
+  '-XX:OnOutOfMemoryError=kill -9 %p' -XX:+CrashOnOutOfMemoryError \
+  -XX:ErrorFile="${LOGS_DIRECTORY}/<%= EZBake::Config[:real_name] %>_err_pid%p.log" \
+  -cp "${INSTALL_DIR}/<%= EZBake::Config[:uberjar_name] %>" \
+  clojure.main \
+  -m <%= EZBake::Config[:main_namespace] %> \
+  --config "${CONFIG}" \
+  --bootstrap-config "${BOOTSTRAP_CONFIG}" \
+  $TK_ARGS
 
 KillMode=process
 
 <% EZBake::Config[:debian][:post_start_action].each do |action| -%>
 ExecStartPost=-<%= action %>
 <% end -%>
+ExecReload=kill -HUP $MAINPID
 SuccessExitStatus=143
 
 [Install]