Add more logs, remove HTTP support, remove limiter

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.mangadex"
-version = "1.0.0-rc9"
+version = "1.0.0-rc10"
 mainClassName = "mdnet.base.MangaDexClient"
 
 repositories {

src/main/kotlin/mdnet/base/Netty.kt

@@ -1,10 +1,8 @@
 package mdnet.base
 
 import io.netty.bootstrap.ServerBootstrap
-import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelFactory
 import io.netty.channel.ChannelFuture
-import io.netty.channel.ChannelHandler
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelInboundHandlerAdapter
 import io.netty.channel.ChannelInitializer
@@ -14,16 +12,9 @@ import io.netty.channel.nio.NioEventLoopGroup
 import io.netty.channel.socket.SocketChannel
 import io.netty.channel.socket.nio.NioServerSocketChannel
 import io.netty.handler.codec.DecoderException
-import io.netty.handler.codec.http.DefaultFullHttpResponse
-import io.netty.handler.codec.http.HttpHeaderNames
 import io.netty.handler.codec.http.HttpObjectAggregator
-import io.netty.handler.codec.http.HttpResponseStatus
 import io.netty.handler.codec.http.HttpServerCodec
-import io.netty.handler.codec.http.HttpUtil
-import io.netty.handler.codec.http.HttpVersion
-import io.netty.handler.ssl.OptionalSslHandler
 import io.netty.handler.ssl.SslContextBuilder
-import io.netty.handler.ssl.SslHandler
 import io.netty.handler.stream.ChunkedWriteHandler
 import io.netty.handler.traffic.GlobalTrafficShapingHandler
 import io.netty.handler.traffic.TrafficCounter
@@ -36,54 +27,15 @@ import java.io.ByteArrayInputStream
 import java.io.IOException
 import java.io.InputStream
 import java.net.InetSocketAddress
-import java.nio.charset.StandardCharsets
 import java.security.PrivateKey
 import java.security.cert.CertificateFactory
 import java.security.cert.X509Certificate
 import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.atomic.AtomicReference
 import javax.net.ssl.SSLException
 
 private val LOGGER = LoggerFactory.getLogger("Application")
 
-@ChannelHandler.Sharable
-class ConnectionCounter : ChannelInboundHandlerAdapter() {
-    private val connections = AtomicInteger()
-
-    override fun channelActive(ctx: ChannelHandlerContext) {
-        val sslHandler = ctx.pipeline()[SslHandler::class.java]
-
-        if (sslHandler != null) {
-            sslHandler.handshakeFuture().addListener {
-                handleConnection(ctx)
-            }
-        } else {
-            handleConnection(ctx)
-        }
-    }
-
-    private fun handleConnection(ctx: ChannelHandlerContext) {
-        if (connections.incrementAndGet() <= Constants.MAX_CONCURRENT_CONNECTIONS) {
-            super.channelActive(ctx)
-        } else {
-            val response = Unpooled.copiedBuffer(Constants.OVERLOADED_MESSAGE, StandardCharsets.UTF_8)
-            val res =
-                DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.SERVICE_UNAVAILABLE, response)
-            res.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/html; charset=UTF-8")
-            HttpUtil.setContentLength(res, response.readableBytes().toLong())
-
-            ctx.writeAndFlush(res)
-            ctx.close()
-        }
-    }
-
-    override fun channelInactive(ctx: ChannelHandlerContext) {
-        super.channelInactive(ctx)
-        connections.decrementAndGet()
-    }
-}
-
 class Netty(private val tls: ServerSettings.TlsCert, private val clientSettings: ClientSettings, private val stats: AtomicReference<Statistics>) : ServerConfig {
     override fun toServer(httpHandler: HttpHandler): Http4kServer = object : Http4kServer {
         private val masterGroup = NioEventLoopGroup()
@@ -98,7 +50,6 @@ class Netty(private val tls: ServerSettings.TlsCert, private val clientSettings:
                 counter.resetCumulativeTime()
             }
         }
-        private val limiter = ConnectionCounter()
 
         override fun start(): Http4kServer = apply {
             val (mainCert, chainCert) = getX509Certs(tls.certificate)
@@ -112,10 +63,9 @@ class Netty(private val tls: ServerSettings.TlsCert, private val clientSettings:
                     .channelFactory(ChannelFactory<ServerChannel> { NioServerSocketChannel() })
                     .childHandler(object : ChannelInitializer<SocketChannel>() {
                         public override fun initChannel(ch: SocketChannel) {
-                            ch.pipeline().addLast("ssl", OptionalSslHandler(sslContext))
+                            ch.pipeline().addLast("ssl", sslContext.newHandler(ch.alloc()))
 
                             ch.pipeline().addLast("codec", HttpServerCodec())
-                            ch.pipeline().addLast("limiter", limiter)
                             ch.pipeline().addLast("aggregator", HttpObjectAggregator(65536))
 
                             ch.pipeline().addLast("burstLimiter", burstLimiter)

src/main/resources/logback.xml

@@ -17,17 +17,17 @@
     </appender>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss} %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
     <root level="TRACE">
-        <appender-ref ref="ASYNC"/>
-    </root>
-
-    <root level="INFO">
         <appender-ref ref="STDOUT"/>
+        <appender-ref ref="ASYNC"/>
     </root>
 
     <logger name="io.netty" level="INFO"/>