Improved logging.

This commit is contained in:
Simone Bordet 2015-11-18 19:19:20 +01:00
parent 4e773c16e2
commit 793c816c66
3 changed files with 9 additions and 10 deletions

View File

@ -23,6 +23,7 @@ import java.nio.ByteBuffer;
import org.eclipse.jetty.http.MetaData;
import org.eclipse.jetty.http2.ErrorCode;
import org.eclipse.jetty.http2.Flags;
import org.eclipse.jetty.http2.frames.FrameType;
import org.eclipse.jetty.http2.frames.HeadersFrame;
import org.eclipse.jetty.http2.frames.PriorityFrame;
import org.eclipse.jetty.util.BufferUtil;
@ -174,6 +175,8 @@ public class HeadersBodyParser extends BodyParser
MetaData metaData = headerBlockParser.parse(buffer, length);
if (metaData != null)
{
if (LOG.isDebugEnabled())
LOG.debug("Parsed {} frame hpack from {}", FrameType.HEADERS, buffer);
state = State.PADDING;
loop = paddingLength == 0;
onHeaders(parentStreamId, weight, exclusive, metaData);

View File

@ -132,13 +132,13 @@ public class Parser
if (!headerParser.parse(buffer))
return false;
int frameType = getFrameType();
FrameType frameType = FrameType.from(getFrameType());
if (LOG.isDebugEnabled())
LOG.debug("Parsed {} frame header", FrameType.from(frameType));
LOG.debug("Parsed {} frame header from {}", frameType, buffer);
if (continuation)
{
if (frameType != FrameType.CONTINUATION.getType())
if (frameType != FrameType.CONTINUATION)
{
// SPEC: CONTINUATION frames must be consecutive.
BufferUtil.clear(buffer);
@ -152,7 +152,7 @@ public class Parser
}
else
{
if (frameType == FrameType.HEADERS.getType() &&
if (frameType == FrameType.HEADERS &&
!headerParser.hasFlag(Flags.END_HEADERS))
{
continuation = true;
@ -172,10 +172,6 @@ public class Parser
return false;
}
FrameType frameType = FrameType.from(type);
if (LOG.isDebugEnabled())
LOG.debug("Parsing {} frame", frameType);
BodyParser bodyParser = bodyParsers[type];
if (headerParser.getLength() == 0)
{
@ -187,7 +183,7 @@ public class Parser
return false;
}
if (LOG.isDebugEnabled())
LOG.debug("Parsed {} frame", frameType);
LOG.debug("Parsed {} frame body from {}", FrameType.from(type), buffer);
reset();
return true;
}

View File

@ -67,7 +67,7 @@ public class PrefaceParser
{
cursor = 0;
if (LOG.isDebugEnabled())
LOG.debug("Parsed preface bytes");
LOG.debug("Parsed preface bytes from {}", buffer);
return true;
}
}