Skip to content

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

Merged
joakime merged 113 commits intojetty-10.0.x-4572-new-slf4j-logger-implfrom
jetty-10.0.x-4572-slf4j-logging-part2
Mar 16, 2020
Merged

Issue #4572 - Replace Jetty Logging with slf4j logging (part 2 of 3)#4643
joakime merged 113 commits intojetty-10.0.x-4572-new-slf4j-logger-implfrom
jetty-10.0.x-4572-slf4j-logging-part2

Conversation

@joakime
Copy link
Copy Markdown
Contributor

@joakime joakime commented Mar 5, 2020

This branch is part 2 (of 3) is based off of branch jetty-10.0.x-4572-new-slf4j-logger-impl (which is part 1 of 3)

See Part 1 on PR #4601

  • Adding slf4j-api to jetty-util
  • Adding jetty-slf4j-impl as solid dependency in jetty-util
  • Removed (most of) org.eclipse.jetty.util.log.* classes (and test cases)
  • Making bridge implementations of org.eclipse.jetty.util.log. classes
    • Logger.java is still the interface
    • Slf4jLogger is a bridge API only, and just calls org.slf4j APIs
    • Log.java is also a bridge API to org.slf4j APIs
  • Adding requires org.slf4j; to module-info.java classes on maven projects that are actually using logging.
  • Removed org.eclipse.jetty.util.log.Log.class=<impl> from jetty-logging.properties
  • Fixing test-realm.xml use of Log classes to print warning
  • Moving jetty logging modules from jetty-util to jetty-home
  • Simplifying jetty logging modules.
  • Adding alternate default provider mechanism in jetty-start so that logging-jetty is the default for provider logging
  • Updating references in testcases of StacklessLogging to new org.eclipse.jetty.logging location.

sbordet and others added 30 commits February 6, 2020 16:32
Made HTTP2SessionContainer implement Graceful, so that it can be found
in the component hierarchy and can shutdown all sessions.
Modified HTTP2ServerSession to reject requests if already closed/shutdown.
Implemented shutdown in HTTP2Session.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Message reader now validates UTF8

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Remove ContextListeners from the destroy list when removed.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Fixes #4577 IPAccessHandler in context

Fixes and tests #4577 IPAccessHandler in context by using target instead of pathInfo for path matching.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Tests #4577 IPAccessHandler target

Updates from review.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4577 IpAccessHandler NPE

Match on full URI path rather than target.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4550 XmlConfiguration argument matching

Improve argument matching by:
 + rejecting obviously non matches (with allowance for unboxing)
 + sorting methods so that derived arguments are tried before more generic (eg String before Object)

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4550 XmlConfiguration argument matching

Improve argument matching by:
 + can unbox from any Number to any Number

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4550

Do not check the assignability of the arguments.  Instead rely on the order of the methods.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4550

unbox test no longer required

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4550

Simplified test

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4550

Cleanup comparator

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4550

Cleanup comparator

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
…atNow

Issue #4606 - fixing formatTick use of `now`
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Fix NPE in HouseKeeper.stopScavenging

Signed-off-by: Hirotaka Ikoma <hikoma@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Lachlan <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
…er' into jetty-10.0.x-4598-InetAccessHandler
gregw and others added 25 commits March 10, 2020 15:14
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
+ Also adding note to jetty-util classes that are used by
  jetty-start

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
…O (not DEBUG)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Issue #4571 - websocket aggregating text and binary MessageSinks
…Writer

Issue #4538 - rework of websocket message reader and writers
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
…xception

Issue #4645 - better error message for empty X-Forwarded-Port value
* Refactor CrossOriginFilter

Signed-off-by: Denny Abraham Cheriyan <dennyac@gmail.com>

* Fix checkstyle violation

Signed-off-by: Denny Abraham Cheriyan <dennyac@gmail.com>
* Refactor CrossOriginFilter

Signed-off-by: Denny Abraham Cheriyan <dennyac@gmail.com>

* Fix checkstyle violation

Signed-off-by: Denny Abraham Cheriyan <dennyac@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime joakime requested a review from gregw March 16, 2020 14:56
…4572-slf4j-logging-part2

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime joakime merged commit c39897c into jetty-10.0.x-4572-new-slf4j-logger-impl Mar 16, 2020
@joakime joakime deleted the jetty-10.0.x-4572-slf4j-logging-part2 branch March 16, 2020 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants