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

Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x

This commit is contained in:
Joakim Erdfelt 2017-03-15 15:36:19 -07:00
parent 706042e131 136ae624ef
commit f775187538
6 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc
View File

@ -45,6 +45,8 @@ The default configuration for logging output will create a file `${jetty.logs}/y
For more advanced logging configurations, please consider use of a separate logging library. For more advanced logging configurations, please consider use of a separate logging library.
[[stderr-properties]]
==== The jetty-logging.properties File
The recommended way to configure `StdErrLog` is to create a `${jetty.home}/resources/jetty-logging.properties` file, specify the log implementation to `StdErrLog` and then setup logging levels. The recommended way to configure `StdErrLog` is to create a `${jetty.home}/resources/jetty-logging.properties` file, specify the log implementation to `StdErrLog` and then setup logging levels.
[source,properties] [source,properties]

2
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SlowClientsTest.java
View File

@ -44,8 +44,10 @@ import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
@Ignore
public class SlowClientsTest public class SlowClientsTest
{ {
private Logger logger = Log.getLogger(getClass()); private Logger logger = Log.getLogger(getClass());