openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1806934 - in /openwebbeans/meecrowave/trunk: meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java meecrowave-maven-plugin/src/main/resources/bin/meecrowave.sh
Date Fri, 01 Sep 2017 11:15:48 GMT
Author: struberg
Date: Fri Sep  1 11:15:48 2017
New Revision: 1806934

URL: http://svn.apache.org/viewvc?rev=1806934&view=rev
Log:
MEECROWAVE-60 graceful shutdown + enable full logging during shutdown

Modified:
    openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
    openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/resources/bin/meecrowave.sh

Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java?rev=1806934&r1=1806933&r2=1806934&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
Fri Sep  1 11:15:48 2017
@@ -40,6 +40,7 @@ import org.apache.commons.lang3.text.Str
 import org.apache.commons.lang3.text.StrSubstitutor;
 import org.apache.coyote.http2.Http2Protocol;
 import org.apache.johnzon.core.BufferStrategy;
+import org.apache.logging.log4j.LogManager;
 import org.apache.meecrowave.api.StartListening;
 import org.apache.meecrowave.api.StopListening;
 import org.apache.meecrowave.cxf.CxfCdiAutoSetup;
@@ -371,6 +372,8 @@ public class Meecrowave implements AutoC
     }
 
     public Meecrowave start() {
+        disableLog4jShutdownHook();
+
         if (configuration.getMeecrowaveProperties() != null && !"meecrowave.properties".equals(configuration.getMeecrowaveProperties()))
{
             configuration.loadFrom(configuration.getMeecrowaveProperties());
         }
@@ -650,6 +653,13 @@ public class Meecrowave implements AutoC
         return this;
     }
 
+    private void disableLog4jShutdownHook() {
+        // magic flag to disable log4j shutdown hook
+        // we need this, otherwise we don't get any logs
+        // when Meecrowave is shutting down!
+        System.setProperty("log4j.shutdownHookEnabled", "false");
+    }
+
     private void broadcastHostEvent(final String event, final Host host) {
         switch (event) {
             case Lifecycle.AFTER_START_EVENT: {
@@ -780,6 +790,17 @@ public class Meecrowave implements AutoC
                     ofNullable(configuration.getPidFile()).ifPresent(File::delete);
                 }
             }
+
+            try {
+                // We disabled the log4j shutdown hook to gain more control and keep logs
during shutdown.
+                // See #disableLog4jShutdownHook()
+                // Otoh that means we need to shutdown Log4j manually.
+                // So here we go...
+                LogManager.shutdown();
+            } catch (Exception e) {
+                System.out.println("A problem happened when shutting down Log4j: " + e +
"\n" + e.getMessage());
+                System.clearProperty("log4j.shutdownHookEnabled");
+            }
         }
     }
 

Modified: openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/resources/bin/meecrowave.sh
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/resources/bin/meecrowave.sh?rev=1806934&r1=1806933&r2=1806934&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/resources/bin/meecrowave.sh
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/resources/bin/meecrowave.sh
Fri Sep  1 11:15:48 2017
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 #
-# forked from Meecrowave
+# This script is forked from Apache Tomcat
 #
 
 # OS specific support.  $var _must_ be set to either true or false.
@@ -375,7 +375,7 @@ elif [ "$1" = "stop" ] ; then
 
   shift
 
-  SLEEP=5
+  SLEEP=15
   if [ ! -z "$1" ]; then
     echo $1 | grep "[^0-9]" >/dev/null 2>&1
     if [ $? -gt 0 ]; then
@@ -393,7 +393,7 @@ elif [ "$1" = "stop" ] ; then
   if [ ! -z "$MEECROWAVE_PID" ]; then
     if [ -f "$MEECROWAVE_PID" ]; then
       if [ -s "$MEECROWAVE_PID" ]; then
-        kill -9 `cat "$MEECROWAVE_PID"` >/dev/null 2>&1
+        kill -15 `cat "$MEECROWAVE_PID"` >/dev/null 2>&1
         if [ $? -gt 0 ]; then
           echo "PID file found but no matching process was found. Stop aborted."
           exit 1
@@ -407,25 +407,10 @@ elif [ "$1" = "stop" ] ; then
     fi
   fi
 
-  #eval "\"$_RUNJAVA\"" $JAVA_OPTS \
-  #  -classpath "\"$CLASSPATH\"" \
-  #  -Dmeecrowave.base="\"$MEECROWAVE_BASE\"" \
-  #  -Dmeecrowave.home="\"$MEECROWAVE_HOME\"" \
-  #  -Djava.io.tmpdir="\"$MEECROWAVE_TMPDIR\"" \
-  #  ${main} "$@" stop
-
-  # stop failed. Shutdown port disabled? Try a normal kill.
-  #if [ $? != 0 ]; then
-  #  if [ ! -z "$MEECROWAVE_PID" ]; then
-  #    echo "The stop command failed. Attempting to signal the process to stop through OS
signal."
-  #    kill -15 `cat "$MEECROWAVE_PID"` >/dev/null 2>&1
-  #  fi
-  #fi
-
   if [ ! -z "$MEECROWAVE_PID" ]; then
     if [ -f "$MEECROWAVE_PID" ]; then
       while [ $SLEEP -ge 0 ]; do
-        kill -9 `cat "$MEECROWAVE_PID"` >/dev/null 2>&1
+        kill -15 `cat "$MEECROWAVE_PID"` >/dev/null 2>&1
         if [ $? -gt 0 ]; then
           rm -f "$MEECROWAVE_PID" >/dev/null 2>&1
           if [ $? != 0 ]; then
@@ -456,7 +441,7 @@ elif [ "$1" = "stop" ] ; then
     fi
   fi
 
-  KILL_SLEEP_INTERVAL=5
+  KILL_SLEEP_INTERVAL=15
   if [ $FORCE -eq 1 ]; then
     if [ -z "$MEECROWAVE_PID" ]; then
       echo "Kill failed: \$MEECROWAVE_PID not set"
@@ -464,7 +449,7 @@ elif [ "$1" = "stop" ] ; then
       if [ -f "$MEECROWAVE_PID" ]; then
         PID=`cat "$MEECROWAVE_PID"`
         echo "Killing Meecrowave with the PID: $PID"
-        kill -9 $PID
+        kill -0 $PID
         while [ $KILL_SLEEP_INTERVAL -ge 0 ]; do
             kill -0 `cat "$MEECROWAVE_PID"` >/dev/null 2>&1
             if [ $? -gt 0 ]; then
@@ -498,9 +483,9 @@ else
   echo "  jpda start        Start MEECROWAVE under JPDA debugger"
   echo "  run               Start MEECROWAVE in the current window"
   echo "  start             Start MEECROWAVE in a separate window"
-  echo "  stop              Stop MEECROWAVE, waiting up to 5 seconds for the process to end"
+  echo "  stop              Stop MEECROWAVE, waiting up t/o 15 seconds for the process to
end"
   echo "  stop n            Stop MEECROWAVE, waiting up to n seconds for the process to end"
-  echo "  stop -force       Stop MEECROWAVE, wait up to 5 seconds and then use kill -KILL
if still running"
+  echo "  stop -force       Stop MEECROWAVE, wait up to 15 seconds and then use kill -KILL
if still running"
   echo "  stop n -force     Stop MEECROWAVE, wait up to n seconds and then use kill -KILL
if still running"
   echo "Note: Waiting for the process to end and use of the -force option require that \$MEECROWAVE_PID
is defined"
   exit 1



Mime
View raw message