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

Improved logging. 

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2020-11-27 13:43:09 +01:00
parent 54924213e8
commit a241b9dd5e
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java
View File

@ -142,7 +142,6 @@ public class HttpReceiverOverHTTP extends HttpReceiver implements HttpParser.Res
BufferUtil.put(networkBuffer.getBuffer(), upgradeBuffer); BufferUtil.put(networkBuffer.getBuffer(), upgradeBuffer);
BufferUtil.flipToFlush(upgradeBuffer, 0); BufferUtil.flipToFlush(upgradeBuffer, 0);
} }
releaseNetworkBuffer(); releaseNetworkBuffer();
return upgradeBuffer; return upgradeBuffer;
} }

2
jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpChannelOverFCGI.java
View File

@ -115,7 +115,7 @@ public class HttpChannelOverFCGI extends HttpChannel
public boolean failAllContent(Throwable failure) public boolean failAllContent(Throwable failure)
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("failing all content with {}", (Object)failure); LOG.debug("failing all content with {} {}", failure, this);
List<HttpInput.Content> copy; List<HttpInput.Content> copy;
try (AutoLock l = _lock.lock()) try (AutoLock l = _lock.lock())
{ {

4
jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpChannelOverHTTP2.java
View File

@ -545,7 +545,7 @@ public class HttpChannelOverHTTP2 extends HttpChannel implements Closeable, Writ
{ {
HttpInput.Content c = _content.get(); HttpInput.Content c = _content.get();
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("failing current content: {} with failure: {}", c, failure); LOG.debug("failing current content {} with {} {}", c, failure, this);
if (c == null) if (c == null)
return false; return false;
if (c.isSpecial()) if (c.isSpecial())
@ -591,7 +591,7 @@ public class HttpChannelOverHTTP2 extends HttpChannel implements Closeable, Writ
public boolean failAllContent(Throwable failure) public boolean failAllContent(Throwable failure)
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("failing all content with {}", (Object)failure); LOG.debug("failing all content with {} {}", failure, this);
boolean atEof = getStream().failAllData(failure); boolean atEof = getStream().failAllData(failure);
atEof |= _contentDemander.failContent(failure); atEof |= _contentDemander.failContent(failure);
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())

6
jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContentProducer.java
View File

@ -162,12 +162,12 @@ class AsyncContentProducer implements ContentProducer
private void failCurrentContent(Throwable x) private void failCurrentContent(Throwable x)
{ {
if (LOG.isDebugEnabled())
LOG.debug("failing currently held content {}", this, x);
if (_transformedContent != null && !_transformedContent.isSpecial()) if (_transformedContent != null && !_transformedContent.isSpecial())
{ {
if (_transformedContent != _rawContent) if (_transformedContent != _rawContent)
{ {
if (LOG.isDebugEnabled())
LOG.debug("failing currently held transformed content {} {}", x, this);
_transformedContent.skip(_transformedContent.remaining()); _transformedContent.skip(_transformedContent.remaining());
_transformedContent.failed(x); _transformedContent.failed(x);
} }
@ -176,6 +176,8 @@ class AsyncContentProducer implements ContentProducer
if (_rawContent != null && !_rawContent.isSpecial()) if (_rawContent != null && !_rawContent.isSpecial())
{ {
if (LOG.isDebugEnabled())
LOG.debug("failing currently held raw content {} {}", x, this);
_rawContent.skip(_rawContent.remaining()); _rawContent.skip(_rawContent.remaining());
_rawContent.failed(x); _rawContent.failed(x);
_rawContent = null; _rawContent = null;

2
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java
View File

@ -129,7 +129,7 @@ public class HttpChannelOverHttp extends HttpChannel implements HttpParser.Reque
public boolean failAllContent(Throwable failure) public boolean failAllContent(Throwable failure)
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("failing all content with {}", (Object)failure); LOG.debug("failing all content with {} {}", failure, this);
if (_content != null) if (_content != null)
{ {
if (_content.isSpecial()) if (_content.isSpecial())

5
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
View File

@ -130,9 +130,10 @@ public class HttpInput extends ServletInputStream implements Runnable
public boolean consumeAll() public boolean consumeAll()
{ {
IOException failure = new IOException("Unconsumed content");
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("consumeAll {}", this); LOG.debug("consumeAll {}", this, failure);
boolean atEof = _contentProducer.consumeAll(new IOException("Unconsumed content")); boolean atEof = _contentProducer.consumeAll(failure);
if (atEof) if (atEof)
_consumedEof = true; _consumedEof = true;