[jetty9] 108/135: Fixed the formatting of the message displayed when starting and stopping the service

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jetty9.

commit d40f3d8b17714a47b95b2374af56e174a440a4d4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 3 15:06:35 2015 +0100

    Fixed the formatting of the message displayed when starting and stopping the service
---
 debian/changelog   |  2 ++
 debian/jetty8.init | 10 +++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f4c962..a6df939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ jetty8 (8.1.18-3) UNRELEASED; urgency=medium
   * Added a VERSION variable in jetty8.init and replaced 'jetty8'
     with 'jetty$VERSION'
   * Added the version in the description of the service
+  * Fixed the formatting of the message displayed when starting and stopping
+    the service
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 02 Dec 2015 10:05:19 +0100
 
diff --git a/debian/jetty8.init b/debian/jetty8.init
index a5ce2a3..6e8d0be 100644
--- a/debian/jetty8.init
+++ b/debian/jetty8.init
@@ -204,7 +204,6 @@ export JAVA_OPTIONS
 PIDFILE="/var/run/$NAME.pid"
 WEBAPPDIR="$JETTY_HOME/webapps"
 ROTATELOGS=/usr/sbin/rotatelogs
-HOSTNAME=$(uname -n)
 
 ##################################################
 # Check for JAVA_HOME
@@ -267,7 +266,7 @@ fi
 ##################################################
 case "$1" in
   start)
-	log_daemon_msg "Starting $DESC." "$NAME"
+	log_daemon_msg "Starting $DESC" "$NAME"
 	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
 	                --user "$JETTY_USER" --startas "$JAVA" > /dev/null; then
 
@@ -313,12 +312,10 @@ case "$1" in
 			JETTY_CMD="'$JETTY_CMD'"
 		fi
 
-		start-stop-daemon --start --pidfile "$PIDFILE" --chuid "$JETTY_USER" --verbose \
+		start-stop-daemon --start --pidfile "$PIDFILE" --chuid "$JETTY_USER" \
 		    --chdir "$JETTY_HOME" --background --make-pidfile -x /bin/bash -- -c \
 		    "$AUTHBIND_COMMAND $JETTY_CMD"
 
-		log_daemon_msg "$DESC started, reachable on http://$HOSTNAME:$JETTY_PORT/." "$NAME"
-
 		sleep 5
 		if start-stop-daemon --test --start --pidfile "$PIDFILE" \
 			--user $JETTY_USER --exec "$JAVA" >/dev/null; then
@@ -335,7 +332,7 @@ case "$1" in
 	;;
 
   stop)
-	log_daemon_msg "Stopping $DESC (was reachable on http://$HOSTNAME:$JETTY_PORT/)." "$NAME"
+	log_daemon_msg "Stopping $DESC" "$NAME"
 
 	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
 		--user "$JETTY_USER" --startas "$JAVA" > /dev/null; then
@@ -368,7 +365,6 @@ case "$1" in
 		rm -f "$PIDFILE"
 		rm -rf "$JVM_TMP"
 		rm -rf "$JETTY_TMP/*"
-		log_daemon_msg "$DESC stopped." "$NAME"
 		log_end_msg 0
 	fi
 	;;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git