Skip to content

Commit eaab709

Browse files
committed
删除原先转发的逻辑
1 parent 9f110ff commit eaab709

15 files changed

+29
-240
lines changed

src/main/java/love/wangqi/codec/DefaultHttpRequestBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public RequestHolder build(FullHttpRequest originRequest) throws Exception {
5757
throw new GatewayNoRouteException();
5858
}
5959
URL url = route.getMapUrl();
60-
logger.info(url.toString());
60+
logger.debug("proxy_pass {}", url.toString());
6161

6262
// 请求路径
6363
QueryStringEncoder queryStringEncoder = new QueryStringEncoder(url.getPath());

src/main/java/love/wangqi/core/DefaultChannelWriteFinishListener.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ public void operationComplete(ChannelFuture future) throws Exception {
2121
Channel channel = future.channel();
2222
Boolean keepAlive = ContextUtil.getKeepAlive(channel);
2323

24-
// if (ContextUtil.getRequest(channel) != null) {
25-
// ContextUtil.getRequest(channel).release();
26-
// }
27-
2824
if (keepAlive == null || !keepAlive) {
2925
channel.close();
3026
}

src/main/java/love/wangqi/exception/GatewayNoRouteException.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@ public GatewayNoRouteException() {
1313
super(HttpResponseStatus.NOT_FOUND, "no route found");
1414
}
1515

16+
@Override
17+
public synchronized Throwable fillInStackTrace() {
18+
return this;
19+
}
1620
}

src/main/java/love/wangqi/exception/handler/DefaultExceptionHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public ExceptionResponse getExceptionResponse(Exception exception) {
4444
public void send(Channel channel, ExceptionResponse exceptionResponse) {
4545
String content = exceptionResponse.getContent();
4646
FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, exceptionResponse.getStatus());
47-
response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
4847
if (content != null) {
4948
response.headers().set("X-Ca-Error-Message", content);
5049
}

src/main/java/love/wangqi/filter/SendForwardFilter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import love.wangqi.codec.RequestHolder;
77
import love.wangqi.config.GatewayConfig;
88
import love.wangqi.context.ContextUtil;
9-
import love.wangqi.filter.command.ForwardRunner;
9+
import love.wangqi.handler.back.BackClientPool;
1010

1111
/**
1212
* @author: wangqi
@@ -33,8 +33,8 @@ public synchronized void filter(Channel channel) throws Exception {
3333

3434
FullHttpRequest httpRequest = ContextUtil.getRequest(channel);
3535
RequestHolder requestHolder = httpRequestBuilder.build(httpRequest);
36+
httpRequest.release();
3637

37-
ForwardRunner forwardRunner = new ForwardRunner(channel, requestHolder);
38-
forwardRunner.execute();
38+
BackClientPool.INSTANCE.request(requestHolder, channel);
3939
}
4040
}

src/main/java/love/wangqi/filter/command/ForwardRunner.java

Lines changed: 0 additions & 115 deletions
This file was deleted.

src/main/java/love/wangqi/handler/BackendFilter.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/main/java/love/wangqi/handler/BackendHandler.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/main/java/love/wangqi/filter/command/HttpClientPool.java renamed to src/main/java/love/wangqi/handler/back/BackClientPool.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package love.wangqi.filter.command;
1+
package love.wangqi.handler.back;
22

33
import io.netty.bootstrap.Bootstrap;
44
import io.netty.channel.Channel;
@@ -25,16 +25,16 @@
2525
* @description:
2626
* @date: Created in 2018-11-27 16:14
2727
*/
28-
public class HttpClientPool {
29-
private final static Logger logger = LoggerFactory.getLogger(HttpClientPool.class);
28+
public class BackClientPool {
29+
private final static Logger logger = LoggerFactory.getLogger(BackClientPool.class);
3030

3131
private final EventLoopGroup group = new NioEventLoopGroup(8 * 4);
3232
private final Bootstrap bootstrap = new Bootstrap();
3333
private ChannelPoolMap<RequestHolder, SimpleChannelPool> poolMap;
3434

35-
public static final HttpClientPool INSTANCE = new HttpClientPool();
35+
public static final BackClientPool INSTANCE = new BackClientPool();
3636

37-
private HttpClientPool() {
37+
private BackClientPool() {
3838
bootstrap
3939
.group(group)
4040
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 500)
@@ -45,7 +45,7 @@ private HttpClientPool() {
4545
poolMap = new AbstractChannelPoolMap<RequestHolder, SimpleChannelPool>() {
4646
@Override
4747
protected SimpleChannelPool newPool(RequestHolder requestHolder) {
48-
return new FixedChannelPool(bootstrap.remoteAddress(requestHolder.getSocketAddress()), new HttpPoolHandler(requestHolder), 50);
48+
return new FixedChannelPool(bootstrap.remoteAddress(requestHolder.getSocketAddress()), new BackPoolHandler(requestHolder), 50);
4949
}
5050
};
5151
}
@@ -67,8 +67,6 @@ public synchronized void request(RequestHolder requestHolder, Channel serverChan
6767
clientChannel.write(bodyRequestEncoder);
6868
}
6969
clientChannel.flush();
70-
71-
// pool.release(clientChannel);
7270
}
7371
});
7472
}

src/main/java/love/wangqi/filter/command/HttpHandler.java renamed to src/main/java/love/wangqi/handler/back/BackHandler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package love.wangqi.filter.command;
1+
package love.wangqi.handler.back;
22

33
import io.netty.channel.Channel;
44
import io.netty.channel.ChannelHandlerContext;
@@ -17,10 +17,10 @@
1717
* @description:
1818
* @date: Created in 2018-11-28 08:37
1919
*/
20-
public class HttpHandler extends SimpleChannelInboundHandler<FullHttpResponse> {
21-
private Logger logger = LoggerFactory.getLogger(HttpHandler.class);
20+
public class BackHandler extends SimpleChannelInboundHandler<FullHttpResponse> {
21+
private Logger logger = LoggerFactory.getLogger(BackHandler.class);
2222

23-
public HttpHandler() {
23+
public BackHandler() {
2424
super(false);
2525
}
2626

0 commit comments

Comments
 (0)