Skip to content
This repository was archived by the owner on Dec 10, 2025. It is now read-only.

Commit f8a65db

Browse files
committed
feat: pass configHolder to connection setup for enhanced configuration flexibility
- Updated `ServerConnectionListener`, `ConnectionImpl`, and `ClientNettyClientImpl` to include `configHolder` in their connection setup methods. - Simplified logging configuration by directly utilizing `configHolder.config`.
1 parent 8c1f707 commit f8a65db

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/ClientNettyClientImpl.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ class ClientNettyClientImpl(
8888
ConnectionImpl.connect(
8989
inetSocketAddress,
9090
configHolder.config.connectionConfig.nettyConfig.useEpoll,
91-
connection
91+
connection,
92+
configHolder
9293
)
9394

9495
ConnectionTickScope.launch {
@@ -205,7 +206,7 @@ class ClientNettyClientImpl(
205206
useEpoll: Boolean,
206207
): ConnectionImpl {
207208
val connection = ConnectionImpl(PacketFlow.CLIENTBOUND, EncryptionManager.instance)
208-
ConnectionImpl.connect(address, useEpoll, connection)
209+
ConnectionImpl.connect(address, useEpoll, connection, configHolder)
209210
return connection
210211
}
211212

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ConnectionImpl.kt

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,8 @@ class ConnectionImpl(
12211221
suspend fun connect(
12221222
address: InetSocketAddress,
12231223
useEpoll: Boolean,
1224-
connection: ConnectionImpl
1224+
connection: ConnectionImpl,
1225+
configHolder: AbstractSurfCloudConfigHolder<*>
12251226
) {
12261227
val channelClass: Class<out SocketChannel>
12271228
val eventLoopGroup: EventLoopGroup
@@ -1248,23 +1249,33 @@ class ConnectionImpl(
12481249
val pipeline = channel.pipeline()
12491250
.addLast(HandlerNames.TIMEOUT, ReadTimeoutHandler(30))
12501251

1251-
configureSerialization(pipeline, PacketFlow.CLIENTBOUND, local = false)
1252+
configureSerialization(
1253+
pipeline,
1254+
PacketFlow.CLIENTBOUND,
1255+
false,
1256+
configHolder
1257+
)
12521258
connection.configurePacketHandler(channel, pipeline)
12531259
}
12541260
})
12551261
.connect(address.address, address.port)
12561262
.suspend()
12571263
}
12581264

1259-
fun configureSerialization(pipeline: ChannelPipeline, side: PacketFlow, local: Boolean) {
1265+
fun configureSerialization(
1266+
pipeline: ChannelPipeline,
1267+
side: PacketFlow,
1268+
local: Boolean,
1269+
configHolder: AbstractSurfCloudConfigHolder<*>
1270+
) {
12601271
val opposite = side.getOpposite()
12611272
val receivingSide = side == PacketFlow.SERVERBOUND
12621273
val sendingSide = opposite == PacketFlow.SERVERBOUND
12631274

12641275

12651276
pipeline.addFirst(
12661277
HandlerNames.LOGGER,
1267-
LoggingHandler(bean<AbstractSurfCloudConfigHolder<*>>().config.logging.nettyLogLevel)
1278+
LoggingHandler(configHolder.config.logging.nettyLogLevel)
12681279
)
12691280
// .addLast(HandlerNames.SSL_HANDLER_ENFORCER, EnforceSslHandler())
12701281
.addLast(HandlerNames.COMPRESS, ZstdEncoder(8))

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/connection/ServerConnectionListener.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ class ServerConnectionListener(
9191
ConnectionImpl.configureSerialization(
9292
pipeline,
9393
PacketFlow.SERVERBOUND,
94-
false
94+
false,
95+
configHolder
9596
)
9697

9798
val connection =

0 commit comments

Comments
 (0)