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

fixed merge

This commit is contained in:
Greg Wilkins 2014-10-10 09:17:48 +11:00
parent 984b3c491f
commit 0df54fd279
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogHandlerTest.java
View File

@ -39,6 +39,8 @@ import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HttpChannel;
import org.eclipse.jetty.server.HttpChannelState;
import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.RequestLog; import org.eclipse.jetty.server.RequestLog;
import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.Response;
@ -48,6 +50,7 @@ import org.eclipse.jetty.toolchain.test.IO;
import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log; 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.log.StdErrLog;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -67,7 +70,7 @@ public class RequestLogHandlerTest
@Override @Override
public void log(Request request, Response response) public void log(Request request, Response response)
{ {
captured.add(String.format("%s %s %s %03d",request.getMethod(),request.getHttpURI().toString(),request.getProtocol(),response.getStatus())); captured.add(String.format("%s %s %s %03d",request.getMethod(),request.getHttpURI().getPathQuery(),request.getProtocol(),response.getStatus()));
} }
} }
@ -373,6 +376,8 @@ public class RequestLogHandlerTest
try try
{ {
((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(true);
((StdErrLog)Log.getLogger(HttpChannelState.class)).setHideStacks(true);
server.start(); server.start();
String host = connector.getHost(); String host = connector.getHost();
@ -411,6 +416,8 @@ public class RequestLogHandlerTest
finally finally
{ {
server.stop(); server.stop();
((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(false);
((StdErrLog)Log.getLogger(HttpChannelState.class)).setHideStacks(false);
} }
} }