openstack/devstack
Code Issues Proposed changes

Merge "Rename LOGNAME to LOGFILENAME."

Browse Source
This commit is contained in:
Jenkins 2013-03-14 22:05:54 +00:00 committed by Gerrit Code Review
commit 470d891fff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stack.sh
View File

@ -524,9 +524,9 @@ if [[ -n "$LOGFILE" ]]; then
# as the template to search for, appending '.*' to match the date # as the template to search for, appending '.*' to match the date
# we added on earlier runs. # we added on earlier runs.
LOGDIR=$(dirname "$LOGFILE") LOGDIR=$(dirname "$LOGFILE")
LOGNAME=$(basename "$LOGFILE") LOGFILENAME=$(basename "$LOGFILE")
mkdir -p $LOGDIR mkdir -p $LOGDIR
find $LOGDIR -maxdepth 1 -name $LOGNAME.\* -mtime +$LOGDAYS -exec rm {} \; find $LOGDIR -maxdepth 1 -name $LOGFILENAME.\* -mtime +$LOGDAYS -exec rm {} \;
LOGFILE=$LOGFILE.${CURRENT_LOG_TIME} LOGFILE=$LOGFILE.${CURRENT_LOG_TIME}
SUMFILE=$LOGFILE.${CURRENT_LOG_TIME}.summary SUMFILE=$LOGFILE.${CURRENT_LOG_TIME}.summary
@ -556,8 +556,8 @@ if [[ -n "$LOGFILE" ]]; then
echo_summary "stack.sh log $LOGFILE" echo_summary "stack.sh log $LOGFILE"
# Specified logfile name always links to the most recent log # Specified logfile name always links to the most recent log
ln -sf $LOGFILE $LOGDIR/$LOGNAME ln -sf $LOGFILE $LOGDIR/$LOGFILENAME
ln -sf $SUMFILE $LOGDIR/$LOGNAME.summary ln -sf $SUMFILE $LOGDIR/$LOGFILENAME.summary
else else
# Set up output redirection without log files # Set up output redirection without log files
# Copy stdout to fd 3 # Copy stdout to fd 3