andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make use of a Logger in the SPDY example and simplify it a bit

Browse Source
This commit is contained in:
Norman Maurer 2014-01-21 07:17:40 +01:00
parent 9a9f98ffcd
commit 5f8a0cc10b
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
example/src/main/java/io/netty/example/spdy/SpdyOrHttpHandler.java
View File

@ -22,11 +22,15 @@ import org.eclipse.jetty.npn.NextProtoNego;
import io.netty.handler.codec.spdy.SpdyOrHttpChooser; import io.netty.handler.codec.spdy.SpdyOrHttpChooser;
import java.util.logging.Logger;
/** /**
* Negotiates with the browser if SPDY or HTTP is going to be used. Once decided, the Netty pipeline is setup with * Negotiates with the browser if SPDY or HTTP is going to be used. Once decided, the Netty pipeline is setup with
* the correct handlers for the selected protocol. * the correct handlers for the selected protocol.
*/ */
public class SpdyOrHttpHandler extends SpdyOrHttpChooser { public class SpdyOrHttpHandler extends SpdyOrHttpChooser {
private static final Logger logger = Logger.getLogger(
SpdyOrHttpHandler.class.getName());
private static final int MAX_CONTENT_LENGTH = 1024 * 100; private static final int MAX_CONTENT_LENGTH = 1024 * 100;
public SpdyOrHttpHandler() { public SpdyOrHttpHandler() {
@ -40,23 +44,10 @@ public class SpdyOrHttpHandler extends SpdyOrHttpChooser {
@Override @Override
protected SelectedProtocol getProtocol(SSLEngine engine) { protected SelectedProtocol getProtocol(SSLEngine engine) {
SpdyServerProvider provider = (SpdyServerProvider) NextProtoNego.get(engine); SpdyServerProvider provider = (SpdyServerProvider) NextProtoNego.get(engine);
String selectedProtocol = provider.getSelectedProtocol(); SelectedProtocol selectedProtocol = provider.getSelectedProtocol();
System.out.println("Selected Protocol is " + (selectedProtocol == null ? "Unknown" : selectedProtocol)); logger.info("Selected Protocol is " + selectedProtocol);
return selectedProtocol;
if (selectedProtocol == null) {
return SpdyOrHttpChooser.SelectedProtocol.UNKNOWN;
} else if (selectedProtocol.equalsIgnoreCase("spdy/3.1")) {
return SpdyOrHttpChooser.SelectedProtocol.SPDY_3_1;
} else if (selectedProtocol.equalsIgnoreCase("spdy/3")) {
return SpdyOrHttpChooser.SelectedProtocol.SPDY_3;
} else if (selectedProtocol.equalsIgnoreCase("http/1.1")) {
return SpdyOrHttpChooser.SelectedProtocol.HTTP_1_1;
} else if (selectedProtocol.equalsIgnoreCase("http/1.0")) {
return SpdyOrHttpChooser.SelectedProtocol.HTTP_1_0;
} else {
return SpdyOrHttpChooser.SelectedProtocol.UNKNOWN;
}
} }
@Override @Override

8
example/src/main/java/io/netty/example/spdy/SpdyServerProvider.java
View File

@ -18,6 +18,7 @@ package io.netty.example.spdy;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import io.netty.handler.codec.spdy.SpdyOrHttpChooser;
import org.eclipse.jetty.npn.NextProtoNego.ServerProvider; import org.eclipse.jetty.npn.NextProtoNego.ServerProvider;
/** /**
@ -53,7 +54,10 @@ public class SpdyServerProvider implements ServerProvider {
selectedProtocol = protocol; selectedProtocol = protocol;
} }
public String getSelectedProtocol() { public SpdyOrHttpChooser.SelectedProtocol getSelectedProtocol() {
return selectedProtocol; if (selectedProtocol == null) {
return SpdyOrHttpChooser.SelectedProtocol.UNKNOWN;
}
return SpdyOrHttpChooser.SelectedProtocol.protocol(selectedProtocol);
} }
} }