Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #4572 - Replace Jetty Logging with slf4j logging (part 2 of 3) #4643

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
92d9d46
Fixes #2788 - Graceful close of HTTP/2 Connection.
sbordet Feb 6, 2020
8b1a669
Issue #2788 - Graceful close of HTTP/2 Connection.
sbordet Feb 7, 2020
36cccd2
Issue #4571 - optimise aggregating text and binary MessageSinks
lachlan-roberts Feb 14, 2020
71b11f0
Issue #4571 - simplify partial MessageSinks reduce copying
lachlan-roberts Feb 14, 2020
e2f86f9
Issue #4538 - simplify MessageInputStream and DispatchedMessageSink
lachlan-roberts Feb 14, 2020
6eccc7e
Issue #4538 - MessageWriter delegates to MessageOutputStream
lachlan-roberts Feb 14, 2020
2467d5a
Issue #4538 - Rework MessageInputStream and MessageReader
lachlan-roberts Feb 17, 2020
1b123b8
Issue #4538 - add invalid utf8 validation tests for MessageReader
lachlan-roberts Feb 17, 2020
97abed5
Issue #4538 - Combine MessageWriterTests, add test for UTF-8 validation
lachlan-roberts Feb 19, 2020
5c839d7
Issue #4538 - allow MessageInputStream not to read to EOF
lachlan-roberts Feb 19, 2020
bc6c950
add missing licence header
lachlan-roberts Feb 19, 2020
b2eddff
Issue #4571 - fix broken tests
lachlan-roberts Feb 19, 2020
34fd148
Issue #4571 - always close MessageSink before completing the Future
lachlan-roberts Feb 20, 2020
adbb3f1
Issue #4571 - review UTF-8 validation in MessageSinks
lachlan-roberts Feb 20, 2020
b138ce5
Issue #847 - deprecate asyncWriteTimeout in the jetty websocket api
lachlan-roberts Feb 21, 2020
03359ec
Tests #4594 ContextListener removed (#4595)
gregw Feb 22, 2020
bb7e480
Issue #4598 - Add URI mapping to InetAccessHandler
lachlan-roberts Feb 25, 2020
9bb6840
Fixes #4577 IPAccessHandler in context (#4580)
gregw Feb 25, 2020
353dc9b
Issue #4550 XmlConfiguration argument matching (#4599)
gregw Feb 25, 2020
d082e54
Issue #4606 - fixing formatTick use of `now`
joakime Feb 26, 2020
18f8752
Merge pull request #4607 from eclipse/jetty-9.4.x-4606-DateCache-form…
joakime Feb 26, 2020
277ce5f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
gregw Feb 26, 2020
5ba9411
cleanup after merge
gregw Feb 26, 2020
65a22e5
Fix NPE in HouseKeeper.stopScavenging (#4604)
hikoma Feb 26, 2020
2faec44
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
janbartel Feb 26, 2020
99a541f
Fixing checkstyle violations
joakime Feb 26, 2020
da9ec6f
Docs for OpenID (#4610)
WalkerWatch Feb 27, 2020
3c551e9
Issue #4598 - rework InetAccessHandler to use only one IncludeExcludeSet
lachlan-roberts Feb 27, 2020
2edc492
Issue #4598 - fix InetAccessHandlerTest expectations to fit new behavior
lachlan-roberts Feb 27, 2020
ccd6c84
Merge remote-tracking branch 'origin/jetty-9.4.x-4598-InetAccessHandl…
lachlan-roberts Feb 27, 2020
75893da
Fixes #4612 - ReservedThreadExecutor hangs when the last reserved thr…
sbordet Feb 27, 2020
a2a75e8
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
sbordet Feb 27, 2020
95f20dd
Use updated setuid with clearSupplementalGroups (#4609)
gregw Feb 27, 2020
5b7472f
Fixing setuid.mod to use specific version of jar
joakime Feb 27, 2020
a304fd9
Updating to version 9.4.27.v20200227
joakime Feb 27, 2020
8aabb52
Updating to version 9.4.28-SNAPSHOT
joakime Feb 27, 2020
b7ab279
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
joakime Feb 28, 2020
c29d966
Issue #4616 hazelcast upgrade 3.12.6 (#4617)
olamy Feb 28, 2020
7e18108
Merge branch 'jetty-9.4.x' into jetty-10.0.x
olamy Feb 28, 2020
95ecb4a
Issue #4598 - Changes from review
lachlan-roberts Feb 29, 2020
6151fc0
Merge pull request #4615 from eclipse/jetty-10.0.x-4598-InetAccessHan…
lachlan-roberts Mar 1, 2020
b014e2f
Merge pull request #4597 from eclipse/jetty-9.4.x-847-WSasyncWriteTim…
lachlan-roberts Mar 1, 2020
af18fb3
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'
lachlan-roberts Mar 1, 2020
cfacaca
Docs for OpenID (#4610)
WalkerWatch Feb 27, 2020
2897377
Issue #4577 - request getPathInfo() could be null in InetAccessHandler
lachlan-roberts Mar 2, 2020
1ee8c8a
Issue #4628 - Non-Required Module Dependency Support
joakime Mar 2, 2020
f2a4c6b
Issue #4620 - Better support for alt PrintStream in StdErrLog
joakime Mar 2, 2020
9ef7790
Merge pull request #4624 from eclipse/jetty-9.4.x-4123-OpenId_Docs
lachlan-roberts Mar 2, 2020
3a8b45d
Issue #4619 align derby version (#4626)
olamy Mar 3, 2020
77a54c2
Merge branch 'jetty-9.4.x' into jetty-10.0.x
olamy Mar 3, 2020
6f19040
fix merge
olamy Mar 3, 2020
c08ca2a
Merge pull request #4630 from eclipse/jetty-9.4.x-4620-console-capture
joakime Mar 3, 2020
f150062
Merge pull request #4629 from eclipse/jetty-9.4.x-4628-optional-depends
joakime Mar 3, 2020
8b6d35d
Issue #4572 - Make Jetty use org.slf4j
joakime Mar 3, 2020
c158d1b
Issue #4572 - Updating module-info.java for org.slf4j
joakime Mar 4, 2020
5aa7136
Issue #4572 - removing org.eclipse.jetty.util.log.class references
joakime Mar 4, 2020
3a1a3d2
Issue #4572 - jetty-start supports manually declared default provider
joakime Mar 4, 2020
af09c19
Issue #4572 - Fixing malformed logger output in DistributionTester
joakime Mar 4, 2020
7c8d52e
Issue #4572 - test-realm use of util.log.Log.warn("") fixed
joakime Mar 4, 2020
1764bfd
Issue #4572 - Cleaning up jetty-maven-plugin and IT testing for Logging
joakime Mar 4, 2020
3a77542
upgrade shade plugin and align version (#4639)
olamy Mar 4, 2020
35af84c
Issue #4572 - Using old slf4j for it testing
joakime Mar 4, 2020
ea1a2a0
Issue #4572 - Updating compiler config to show Xlint:exports warnings
joakime Mar 5, 2020
5e71758
Issue #4572 - Updating module-info.java based on Xlint:exports warnings
joakime Mar 6, 2020
c1dc03a
Issue #4443 - Track backport of ALPN APIs to Java 8
sbordet Mar 7, 2020
36c7fe8
Updated URLs for Maven Central and GitHub.
sbordet Mar 7, 2020
ac724a1
Ignored ExternalSiteTest for reliability.
sbordet Mar 7, 2020
9182e30
Fixed OSGi tests by overriding the Maven Central
sbordet Mar 7, 2020
273b729
Updated build to JDK 8 otherwise TLS communication with
sbordet Mar 7, 2020
1a165aa
Using JDK 7 for javadocs.
sbordet Mar 7, 2020
67eb9b3
use same version as in pom
olamy Mar 8, 2020
797d255
Issue #4645 - better error message for empty X-Forwarded-Port value
lachlan-roberts Mar 9, 2020
1c4a21c
Merge branch 'jetty-9.4.x' into jetty-10.0.x
olamy Mar 9, 2020
7554a3a
fix merge
olamy Mar 9, 2020
e0de4b0
Issue #4572 - Updating console-capture and logging-noop
joakime Mar 9, 2020
a31a050
Issue #4572 - Adding slf4j bridge (capture) jetty modules
joakime Mar 9, 2020
dfd3875
Jetty 10.0.x 4506 metadata complete (#4587)
janbartel Mar 9, 2020
171a960
Issue #4572 - Updates to jetty logging module locations
joakime Mar 9, 2020
916b3e5
Merged 'jetty-10.0.x' into 'jetty-10.0.x-2788-graceful_http2_close'.
sbordet Mar 9, 2020
6c8e25f
Issue #4572 - Applying changes requested in PR to logging modules
joakime Mar 9, 2020
3a6c9b8
Issue #2788 - Graceful close of HTTP/2 Connection.
sbordet Mar 10, 2020
9c3cfb9
Issue #4647 Hazelcast remote.xml configuration file do not configure …
attiand Mar 10, 2020
82247f2
Issue #4647 Hazelcast remote.xml configuration file do not configure …
attiand Mar 10, 2020
d938fca
Merge pull request #4627 from eclipse/jetty-10.0.x-4577-InetAccessHan…
lachlan-roberts Mar 10, 2020
dfa0e0a
Jetty 10.0.x 4507 forwardincludemappings (#4590)
janbartel Mar 10, 2020
678385b
Merge pull request #4554 from eclipse/jetty-10.0.x-2788-graceful_http…
sbordet Mar 10, 2020
965483e
Issue #4631 - Warning about skipping of <Arg> nodes is in wrong place…
joakime Mar 10, 2020
28d6009
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
gregw Mar 10, 2020
95c0513
Issue #4572 - Changing reference to slf4j dependent mod
joakime Mar 10, 2020
360b878
Fixed merge
gregw Mar 10, 2020
ac0e4a7
Issue #4572 - Process requested enabled modules in topological order
joakime Mar 10, 2020
916e4ad
Issue #4572 - Process requested enabled modules in topological order
joakime Mar 10, 2020
6d4b5b4
Issue #4572 - Limiting inclusions in shaded jetty-start
joakime Mar 10, 2020
d8e7060
Issue #4572 - Default logging level on baseline logging config is INF…
joakime Mar 10, 2020
b0ddba4
Merge pull request #4593 from eclipse/jetty-10.0.x-4571-MessageSink
lachlan-roberts Mar 11, 2020
fef25e7
Merge branch jetty-10.0.x into jetty-10.0.x-4538-MessageReaderWriter
lachlan-roberts Mar 11, 2020
b1d30fc
Merge pull request #4588 from eclipse/jetty-10.0.x-4538-MessageReader…
lachlan-roberts Mar 11, 2020
dbd89ce
Issue #4645 - validate port range & return 400 on bad forwarded headers
lachlan-roberts Mar 11, 2020
d5ee7b0
Issue #4645 - handle exceptions from all headers
lachlan-roberts Mar 11, 2020
633298b
Issue #4645 - changes from review
lachlan-roberts Mar 11, 2020
fcbe704
Issue #4645 - do not wrap exceptions from onError with RuntimeException
lachlan-roberts Mar 13, 2020
b497827
Merge pull request #4648 from eclipse/jetty-9.4.x-4645-forwardedPortE…
lachlan-roberts Mar 15, 2020
fb00422
Refactor CrossOriginFilter with small perf improvements (#4672)
dennyac Mar 16, 2020
ce8d2ef
Refactor CrossOriginFilter with small perf improvements (#4672)
dennyac Mar 16, 2020
ca74fbe
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
gregw Mar 16, 2020
ae0ec5d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
gregw Mar 16, 2020
4d6386d
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
sbordet Mar 16, 2020
665d1c8
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
sbordet Mar 16, 2020
bc60ff1
Fixes #4676 - ALPN support for Java 15.
sbordet Mar 16, 2020
5148bee
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
sbordet Mar 16, 2020
8e31143
Issue #4572 - Changing from system to server classes in logging
joakime Mar 16, 2020
25ca6ac
Issue #4572 - Updating other modules to use new logging names
joakime Mar 16, 2020
6a66efe
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
joakime Mar 16, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
34 changes: 34 additions & 0 deletions VERSION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,40 @@ jetty-10.0.0-alpha0 - 11 July 2019
+ 3849 ClosedChannelException from jetty-test-webapp javax websocket chat
example

jetty-9.4.27.v20200227 - 27 February 2020
+ 3247 Generate jetty-maven-plugin website
+ 4247 Cookie security attributes are going to mandated by Google Chrome
+ 4360 Upgrade to Apache Jasper 8.5.49
+ 4475 WebSocket JSR356 implementation not honoring javadoc of MessageHandler
on Whole<Reader>
+ 4495 Review ReservedThreadExecutor's concurrency model
+ 4504 X-Forwarded-Server header overwrites X-Forwarded-Host
+ 4520 Jetty jdbc session manager causing exceptions for violating primary key
in inserting session in the table
+ 4529 ErrorHandler showing servlet info, can not be disabled unless
overriding most of its functionality
+ 4533 Reinstate hard close in dispatcher
+ 4537 High CPU on Jetty Websocket thread
+ 4541 Jetty server always allocates maximum response header size
+ 4550 XmlConfiguration constructor selection based on number of arguments
+ 4567 Jetty logging supporting Throwable as last argument
+ 4573 Order dependency of X-Forwarded-Host and X-Forwarded-Port
+ 4575 Stopping ReservedThreadExecutor may hang
+ 4577 request getPathInfo returns null
+ 4594 ServletContextListeners added to destroyServletContextListeners in
ContextHandler::startContext() are not removed by
ContextHandler::removeEventListener()
+ 4606 DateCache.formatNow(long now) does not honor the passed in long
+ 4612 ReservedThreadExecutor hangs when the last reserved thread idles out

jetty-9.4.26.v20200117 - 17 January 2020
+ 2620 Exception from user endpoint onClose results in unclosed
WebSocketSession
+ 4383 Errors deleting multipart tmp files java.lang.NullPointerException
under heavy load
+ 4444 TLS Connection Timeout Intermittently
+ 4461 IllegalStateException in HttpOutput with Jersey

jetty-9.4.25.v20191220 - 20 December 2019
+ 995 UrlEncoded.encodeString should skip more characters
+ 2195 Add parameter expansion to start.jar --exec parameters
Expand Down
4 changes: 4 additions & 0 deletions apache-jsp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@
</build>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
Expand Down
1 change: 1 addition & 0 deletions apache-jsp/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

requires java.xml;
requires jetty.servlet.api;
requires org.slf4j;
requires org.eclipse.jetty.util;
requires org.mortbay.apache.jasper;

Expand Down
21 changes: 10 additions & 11 deletions apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JuliLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,25 @@

package org.eclipse.jetty.apache.jsp;

import org.slf4j.LoggerFactory;

public class JuliLog implements org.apache.juli.logging.Log
{
public static org.apache.juli.logging.Log getInstance(String name)
{
return new JuliLog(name);
}

private final org.eclipse.jetty.util.log.Logger _logger;
private final org.eclipse.jetty.util.log.StdErrLog _stdErrLog;
private final org.slf4j.Logger _logger;

public JuliLog()
{
_logger = org.eclipse.jetty.util.log.Log.getRootLogger();
_stdErrLog = (_logger instanceof org.eclipse.jetty.util.log.StdErrLog) ? (org.eclipse.jetty.util.log.StdErrLog)_logger : null;
_logger = LoggerFactory.getLogger("");
}

public JuliLog(String name)
{
_logger = org.eclipse.jetty.util.log.Log.getLogger(name);
_stdErrLog = (_logger instanceof org.eclipse.jetty.util.log.StdErrLog) ? (org.eclipse.jetty.util.log.StdErrLog)_logger : null;
_logger = LoggerFactory.getLogger(name);
}

@Override
Expand All @@ -49,31 +48,31 @@ public boolean isDebugEnabled()
@Override
public boolean isErrorEnabled()
{
return _stdErrLog == null ? true : _stdErrLog.getLevel() <= org.eclipse.jetty.util.log.StdErrLog.LEVEL_WARN;
return _logger.isErrorEnabled();
}

@Override
public boolean isFatalEnabled()
{
return _stdErrLog == null ? true : _stdErrLog.getLevel() <= org.eclipse.jetty.util.log.StdErrLog.LEVEL_WARN;
return _logger.isErrorEnabled();
}

@Override
public boolean isInfoEnabled()
{
return _stdErrLog == null ? true : _stdErrLog.getLevel() <= org.eclipse.jetty.util.log.StdErrLog.LEVEL_INFO;
return _logger.isInfoEnabled();
}

@Override
public boolean isTraceEnabled()
{
return _stdErrLog == null ? true : _stdErrLog.getLevel() <= org.eclipse.jetty.util.log.StdErrLog.LEVEL_DEBUG;
return _logger.isTraceEnabled();
}

@Override
public boolean isWarnEnabled()
{
return _stdErrLog == null ? true : _stdErrLog.getLevel() <= org.eclipse.jetty.util.log.StdErrLog.LEVEL_WARN;
return _logger.isWarnEnabled();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion apache-jstl/src/test/resources/jetty-logging.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
# Jetty Logging using jetty-slf4j-impl
# org.eclipse.jetty.LEVEL=INFO
# org.eclipse.jetty.util.LEVEL=DEBUG
8 changes: 8 additions & 0 deletions examples/embedded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
<bundle-symbolic-name>${project.groupId}.embedded</bundle-symbolic-name>
</properties>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog
## Jetty Logging using jetty-slf4j-impl
#org.eclipse.jetty.util.log.javautil.PROPERTIES=java-util-logging.properties
#org.eclipse.jetty.util.log.SOURCE=true
#org.eclipse.jetty.LEVEL=INFO
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
# Jetty Logging using jetty-slf4j-impl
org.eclipse.jetty.LEVEL=INFO
org.eclipse.jetty.embedded.JettyDistribution.LEVEL=DEBUG
#org.eclipse.jetty.STACKS=true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
exports org.eclipse.jetty.alpn.client;

requires transitive org.eclipse.jetty.io;
requires org.slf4j;

uses ALPNProcessor.Client;
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
{
requires org.conscrypt;
requires transitive org.eclipse.jetty.alpn.client;
requires org.slf4j;

provides ALPNProcessor.Client with ConscryptClientALPNProcessor;
}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
# Jetty Logging using jetty-slf4j-impl
#org.eclipse.jetty.LEVEL=DEBUG
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
module org.eclipse.jetty.alpn.conscrypt.server
{
requires org.conscrypt;
requires org.slf4j;
requires transitive org.eclipse.jetty.alpn.server;

provides ALPNProcessor.Server with ConscryptServerALPNProcessor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
# Jetty Logging using jetty-slf4j-impl
#org.eclipse.jetty.LEVEL=DEBUG
#org.eclipse.jetty.alpn.LEVEL=DEBUG
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
module org.eclipse.jetty.alpn.java.client
{
requires transitive org.eclipse.jetty.alpn.client;
requires org.slf4j;

provides ALPNProcessor.Client with JDK9ClientALPNProcessor;
}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
# Jetty Logging using jetty-slf4j-impl
#org.eclipse.jetty.LEVEL=DEBUG
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

module org.eclipse.jetty.alpn.java.server
{
requires org.slf4j;
requires transitive org.eclipse.jetty.alpn.server;

provides ALPNProcessor.Server with JDK9ServerALPNProcessor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
# Jetty Logging using jetty-slf4j-impl
#org.eclipse.jetty.LEVEL=DEBUG
#org.eclipse.jetty.alpn.LEVEL=DEBUG
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html

[depend]
alpn-impl/alpn-11
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
exports org.eclipse.jetty.alpn.server;

requires transitive org.eclipse.jetty.server;
requires org.slf4j;

uses ALPNProcessor.Server;
}
1 change: 1 addition & 0 deletions jetty-annotations/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
requires java.naming;
requires transitive org.eclipse.jetty.plus;
requires transitive org.objectweb.asm;
requires org.slf4j;

uses ServletContainerInitializer;

Expand Down
Loading