openstack/devstack
Code Issues Proposed changes

Merge "Remove rejoin-stack.sh"

Browse Source
This commit is contained in:
Jenkins 2016-03-14 18:55:23 +00:00 committed by Gerrit Code Review
commit 082399ef18
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions-common
View File

@ -1644,7 +1644,7 @@ function service_check {
done
if [ -n "$failures" ]; then
die $LINENO "More details about the above errors can be found with screen, with ./rejoin-stack.sh"
die $LINENO "More details about the above errors can be found with screen"
fi
}

25
rejoin-stack.sh
View File

@ -1,25 +0,0 @@
#! /usr/bin/env bash
# This script rejoins an existing screen, or re-creates a
# screen session from a previous run of stack.sh.
TOP_DIR=`dirname $0`
# Import common functions in case the localrc (loaded via stackrc)
# uses them.
source $TOP_DIR/functions
source $TOP_DIR/stackrc
SCREENRC=$TOP_DIR/$SCREEN_NAME-screenrc
# if screenrc exists, run screen
if [[ -e $SCREENRC ]]; then
if screen -ls | egrep -q "[0-9]+.${SCREEN_NAME}"; then
echo "Attaching to already started screen session.."
exec screen -r $SCREEN_NAME
fi
exec screen -c $SCREENRC
fi
echo "Couldn't find $SCREENRC file; have you run stack.sh yet?"
exit 1