Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve logging modules and listing #984 

Remove support for JETTY_LOGS
This commit is contained in:
Greg Wilkins 2016-10-20 11:02:06 +11:00
parent d7b781574d
commit b08fa971a5
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty-distribution/src/main/resources/bin/jetty.sh
View File

@ -344,24 +344,11 @@ then
fi fi
##################################################### #####################################################
# See if JETTY_LOGS is defined # See if Deprecated JETTY_LOGS is defined
##################################################### #####################################################
if [ -z "$JETTY_LOGS" ] && [ -d $JETTY_BASE/logs ]
then
JETTY_LOGS=$JETTY_BASE/logs
fi
if [ -z "$JETTY_LOGS" ] && [ -d $JETTY_HOME/logs ]
then
JETTY_LOGS=$JETTY_HOME/logs
fi
if [ "$JETTY_LOGS" ] if [ "$JETTY_LOGS" ]
then then
echo "** WARNING: JETTY_LOGS is Deprecated. Please configure logging within the jetty base." >&2
case "`uname`" in
CYGWIN*) JETTY_LOGS="`cygpath -w $JETTY_LOGS`";;
esac
JAVA_OPTIONS=(${JAVA_OPTIONS[*]} "-Djetty.logging.dir=$JETTY_LOGS")
fi fi
##################################################### #####################################################

1
jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc
View File

@ -231,7 +231,6 @@ JETTY_BASE = /opt/web/mybase
JETTY_CONF = /opt/jetty/jetty-distribution-{VERSION}/etc/jetty.conf JETTY_CONF = /opt/jetty/jetty-distribution-{VERSION}/etc/jetty.conf
JETTY_PID = /var/run/jetty.pid JETTY_PID = /var/run/jetty.pid
JETTY_START = /opt/jetty/jetty-distribution-{VERSION}/start.jar JETTY_START = /opt/jetty/jetty-distribution-{VERSION}/start.jar
JETTY_LOGS = /opt/web/mybase/logs
CLASSPATH = CLASSPATH =
JAVA = /usr/bin/java JAVA = /usr/bin/java
JAVA_OPTIONS = -Djetty.state=/opt/web/mybase/jetty.state JAVA_OPTIONS = -Djetty.state=/opt/web/mybase/jetty.state