hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 22:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1478 from tdonohue/DS-3233

Browse Source 
DS-3233 : Hardcode log directory into start-handle-server script
This commit is contained in:
Tim Donohue
2016-08-03 15:34:07 -05:00
committed by GitHub
parent d29e6239f5 3e79686005
commit def2698c20
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dspace/bin/start-handle-server
View File

@@ -45,7 +45,14 @@
# Assume we're in the bin subdirectory of the DSpace installation directory # Assume we're in the bin subdirectory of the DSpace installation directory
BINDIR=`dirname $0` BINDIR=`dirname $0`
DSPACEDIR=`cd "$BINDIR/.." ; pwd`
# Read parameters from DSpace config
DSPACEDIR=`$BINDIR/dspace dsprop --property dspace.dir`
HANDLEDIR=`$BINDIR/dspace dsprop --property handle.dir`
# Assume log directory is a subdirectory of DSPACEDIR.
# If you want your handle server logs stored elsewhere, change this value
LOGDIR=$DSPACEDIR/log
# Get the JARs in $DSPACEDIR/jsp/WEB-INF/lib, separated by ':' # Get the JARs in $DSPACEDIR/jsp/WEB-INF/lib, separated by ':'
JARS=`echo $DSPACEDIR/lib/*.jar | sed 's/ /\:/g'` JARS=`echo $DSPACEDIR/lib/*.jar | sed 's/ /\:/g'`
@@ -62,14 +69,10 @@ if [ "$JAVA_OPTS" = "" ]; then
JAVA_OPTS=-Xmx256m JAVA_OPTS=-Xmx256m
fi fi
# Read parameters from DSpace config
handledir=`$BINDIR/dspace dsprop --property handle.dir`
logdir=`$BINDIR/dspace dsprop --property log.dir`
# Remove lock file, in case the old Handle server did not shut down properly # Remove lock file, in case the old Handle server did not shut down properly
rm -f $handledir/txns/lock rm -f $handledir/txns/lock
# Start the Handle server, with a special log4j properties file. # Start the Handle server, with a special log4j properties file.
# We cannot simply write to the same logs, since log4j # We cannot simply write to the same logs, since log4j
# does not support more than one JVM writing to the same rolling log. # does not support more than one JVM writing to the same rolling log.
nohup java $JAVA_OPTS -classpath $FULLPATH -Ddspace.log.init.disable=true -Dlog4j.configuration=log4j-handle-plugin.properties net.handle.server.Main $handledir </dev/null >> $logdir/handle-server.log 2>&1 & nohup java $JAVA_OPTS -classpath $FULLPATH -Ddspace.log.init.disable=true -Dlog4j.configuration=log4j-handle-plugin.properties net.handle.server.Main $HANDLEDIR </dev/null >> $LOGDIR/handle-server.log 2>&1 &