Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

update rsync [merge] #1908

Merged
merged 2 commits into from Apr 4, 2013
Merged

update rsync [merge] #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
775ea4e
update rsync
bdecoste Apr 4, 2013
150dbc7
hot_deploy
bdecoste Apr 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion cartridges/openshift-origin-cartridge-abstract/abstract-jboss/info/bin/deploy.sh
View file
Open in desktop
Expand Up @@ -14,7 +14,9 @@ CART_NAME=$(get_cartridge_name_from_path)
if [ ! -h ${OPENSHIFT_REPO_DIR}/deployments ] && [ ! -h ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments ]
then
if [ "$(ls ${OPENSHIFT_REPO_DIR}/deployments)" ]; then
rsync -r --delete --exclude ".*" ${OPENSHIFT_REPO_DIR}/deployments/* ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments
rsync -r --delete --exclude ".*" ${OPENSHIFT_REPO_DIR}/deployments/ ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments/
else
rm -rf ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments/*
fi
fi

Expand Down
7 changes: 4 additions & 3 deletions cartridges/openshift-origin-cartridge-jbossas-7/info/bin/build.sh
View file
Open in desktop
Expand Up @@ -96,9 +96,10 @@ then
if [ ! -h ${OPENSHIFT_REPO_DIR}/deployments ] && [ ! -h ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments ]
then
if [ "$(ls ${OPENSHIFT_REPO_DIR}/deployments)" ]; then
rsync -r --delete --exclude ".*" ${OPENSHIFT_REPO_DIR}/deployments/* ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments
fi
fi
rsync -r --delete --exclude ".*" ${OPENSHIFT_REPO_DIR}/deployments/ ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments/
else
rm -rf ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments/*
fi
fi
else
export OPENSHIFT_MAVEN_MIRROR
Expand Down
6 changes: 4 additions & 2 deletions cartridges/openshift-origin-cartridge-jbosseap-6.0/info/bin/build.sh
View file
Open in desktop
Expand Up @@ -96,8 +96,10 @@ then
if [ ! -h ${OPENSHIFT_REPO_DIR}/deployments ] && [ ! -h ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments ]
then
if [ "$(ls ${OPENSHIFT_REPO_DIR}/deployments)" ]; then
rsync -r --delete --exclude ".*" ${OPENSHIFT_REPO_DIR}/deployments/* ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments
fi
rsync -r --delete --exclude ".*" ${OPENSHIFT_REPO_DIR}/deployments/ ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments/
else
rm -rf ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments/*
fi
fi
fi
else
Expand Down
28 changes: 17 additions & 11 deletions cartridges/openshift-origin-cartridge-jbosseap/bin/control
View file
Open in desktop
Expand Up @@ -178,8 +178,10 @@ function deploy() {
CART_NAME=redhat-${cartridge_type}

if [ "$(ls ${OPENSHIFT_REPO_DIR}/deployments)" ]; then
rsync -r --delete --exclude ".*" ${OPENSHIFT_REPO_DIR}/deployments/* ${OPENSHIFT_HOMEDIR}/${CART_NAME}/standalone/deployments
fi
rsync -r --delete --exclude ".*" ${OPENSHIFT_REPO_DIR}/deployments/ ${OPENSHIFT_HOMEDIR}/${CART_NAME}/standalone/deployments/
else
rm -rf ${OPENSHIFT_HOMEDIR}/${CART_NAME}/${CART_NAME}/standalone/deployments/*
fi
}

function start() {
Expand Down Expand Up @@ -217,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
}

Expand Down