hot_deploy

bdecoste · Apr 4, 2013 · 150dbc7 · 150dbc7
1 parent 775ea4e
commit 150dbc7
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/cartridges/openshift-origin-cartridge-jbosseap/bin/control b/cartridges/openshift-origin-cartridge-jbosseap/bin/control
@@ -219,15 +219,19 @@ function stop() {
 
     if isrunning
     then
-		if [ -f "$JBOSSEAP_PID_FILE" ]; then
-	        source ${OPENSHIFT_REPO_DIR}/.openshift/action_hooks/pre_stop_${cartridge_type}
-	        pid=$(cat $JBOSSEAP_PID_FILE);
-	        echo "Sending SIGTERM to jboss:$pid ..." 1>&2
-	        killtree $pid
-	        source ${OPENSHIFT_REPO_DIR}/.openshift/action_hooks/post_stop_${cartridge_type}
-	    else 
-	        echo "Failed to locate JBOSS PID File" 1>&2
-	    fi
+        if  hot_deploy_marker_is_present ; then
+                echo "Hot deploy enabled. Not stopping" 
+        else
+			if [ -f "$JBOSSEAP_PID_FILE" ]; then
+		        source ${OPENSHIFT_REPO_DIR}/.openshift/action_hooks/pre_stop_${cartridge_type}
+		        pid=$(cat $JBOSSEAP_PID_FILE);
+		        echo "Sending SIGTERM to jboss:$pid ..." 1>&2
+		        killtree $pid
+		        source ${OPENSHIFT_REPO_DIR}/.openshift/action_hooks/post_stop_${cartridge_type}
+		    else 
+		        echo "Failed to locate JBOSS PID File" 1>&2
+		    fi
+		fi
 	fi
 }