Merge branch 'branches/rudder/2.11' into branches/rudder/3.0

Conflicts: rudder-jetty/SOURCES/Makefile
Normation · Apr 1, 2015 · 526918f · 526918f
2 parents 512ff82 + fb76c94
commit 526918f
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 7 deletions.
diff --git a/rudder-jetty/SOURCES/Makefile b/rudder-jetty/SOURCES/Makefile
@@ -56,6 +56,7 @@ localdepends: ./jetty7
 	patch -p0 -s < patches/jetty/jetty-init-sizecheck.patch
 	patch -p0 -s < patches/jetty/jetty-init-use-rudder-jetty-defaults.patch
 	patch -p0 -s < patches/jetty/jetty-init-check-java-version.patch
+	patch -p0 -s < patches/jetty/jetty-init-prevent-false-failed-starts.patch
 
 	cp ./jetty7/bin/jetty.sh ./jetty7/bin/jetty-debian.sh
 	cp ./jetty7/bin/jetty.sh ./jetty7/bin/jetty-rpm.sh

diff --git a/rudder-jetty/SOURCES/patches/jetty/jetty-init-prevent-false-failed-starts.patch b/rudder-jetty/SOURCES/patches/jetty/jetty-init-prevent-false-failed-starts.patch
@@ -0,0 +1,62 @@
+--- jetty7/bin/jetty.sh	2015-03-31 12:08:37.319515629 +0200
++++ jetty7/bin/jetty.sh	2015-03-31 12:12:16.660886179 +0200
+@@ -117,10 +117,10 @@
+   do
+     sleep 4
+     [ -z "$(grep STARTED $1 2>/dev/null)" ] || return 0
++
+     [ -z "$(grep STOPPED $1 2>/dev/null)" ] || return 1
+     [ -z "$(grep FAILED $1 2>/dev/null)" ] || return 1
+-    local PID=$(cat "$2" 2>/dev/null) || return 1
+-    kill -0 "$PID" 2>/dev/null || return 1
++
+     echo -n ". "
+   done
+
+@@ -358,8 +358,8 @@
+ then
+   JETTY_STATE=$JETTY_HOME/jetty.state
+ fi
++
+ JAVA_OPTIONS+=("-Djetty.state=$JETTY_STATE")
+-rm -f $JETTY_STATE
+
+ ##################################################
+ # Set default JVM parameters, to be
+@@ -487,7 +487,15 @@
+       exit
+     fi
+
+-    if [ $UID -eq 0 ] && type start-stop-daemon > /dev/null 2>&1 
++    if [ $(ps aux|grep -cE "[j]ava .* /opt/rudder/jetty7/start.jar") -ne 0 ]
++    then
++        echo "already running."
++        exit 0
++    fi
++
++    rm -f ${JETTY_STATE}
++
++    if [ $UID -eq 0 ] && type start-stop-daemon > /dev/null 2>&1
+     then
+       unset CH_USER
+       if [ -n "$JETTY_USER" ]
+@@ -561,7 +569,9 @@
+         sleep 1
+       done
+
++      rm -f ${JETTY_STATE}
+       rm -f "$JETTY_PID"
++
+       echo OK
+     else
+       PID=$(cat "$JETTY_PID" 2>/dev/null)
+@@ -580,7 +590,9 @@
+         sleep 1
+       done
+
++      rm -f ${JETTY_STATE}
+       rm -f "$JETTY_PID"
++
+       echo OK
+     fi
+
diff --git a/rudder-jetty/SOURCES/patches/jetty/jetty-init-sles.patch b/rudder-jetty/SOURCES/patches/jetty/jetty-init-sles.patch
@@ -1,15 +1,15 @@
---- jetty7/bin/jetty-sles.sh	2014-03-13 14:05:22.080605960 +0100
-+++ jetty7/bin/jetty-sles.sh	2014-03-13 14:06:07.388526581 +0100
-@@ -464,7 +464,7 @@
-       exit
-     fi
+--- jetty7/bin/jetty-sles.sh	2014-11-21 18:18:10.761944184 +0100
++++ jetty7/bin/jetty-sles.sh	2014-11-21 18:17:40.897795646 +0100
+@@ -512,7 +512,7 @@
 
--    if [ $UID -eq 0 ] && type start-stop-daemon > /dev/null 2>&1 
+     rm -f ${JETTY_STATE}
+
+-    if [ $UID -eq 0 ] && type start-stop-daemon > /dev/null 2>&1
 +    if [ "$START_STOP_DAEMON" = "1" ] && [ $UID -eq 0 ] && type start-stop-daemon > /dev/null 2>&1
      then
        unset CH_USER
        if [ -n "$JETTY_USER" ]
-@@ -521,7 +521,7 @@
+@@ -570,7 +570,7 @@
 
    stop)
      echo -n "Stopping Jetty: "
@@ -18,3 +18,4 @@
        start-stop-daemon -K -p"$JETTY_PID" -d"$JETTY_HOME" -a "$JAVA" -s HUP
 
        TIMEOUT=30
+