fix(agent): unregisterServer method map mismatch (jeremylvln#94)

BridgeSplash · Jan 10, 2023 · b8a8d31 · b8a8d31
1 parent d20cedb
commit b8a8d31
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/packages/shulker-proxy-agent-common/src/main/kotlin/io/shulkermc/proxyagent/Configuration.kt b/packages/shulker-proxy-agent-common/src/main/kotlin/io/shulkermc/proxyagent/Configuration.kt
@@ -4,22 +4,24 @@ data class Configuration(
  val proxyNamespace: String,
  val proxyName: String,
  val ttlSeconds: Long
-)
+) {
+ companion object {
+ fun load(): Configuration {
+ val proxyNamespace = System.getenv("SHULKER_PROXY_NAMESPACE")
+ ?: throw IllegalStateException("No SHULKER_PROXY_NAMESPACE found in environment")
 
-fun parse(): Configuration {
- val proxyNamespace = System.getenv("SHULKER_PROXY_NAMESPACE")
- ?: throw IllegalStateException("No SHULKER_PROXY_NAMESPACE found in environment")
+ val proxyName = System.getenv("SHULKER_PROXY_NAME")
+ ?: throw IllegalStateException("No SHULKER_PROXY_NAME found in environment")
 
- val proxyName = System.getenv("SHULKER_PROXY_NAME")
- ?: throw IllegalStateException("No SHULKER_PROXY_NAME found in environment")
+ val ttlSecondsStr = System.getenv("SHULKER_PROXY_TTL_SECONDS")
+ ?: throw IllegalStateException("No SHULKER_PROXY_TTL_SECONDS found in environment")
+ val ttlSeconds = ttlSecondsStr.toLong()
 
- val ttlSecondsStr = System.getenv("SHULKER_PROXY_TTL_SECONDS")
- ?: throw IllegalStateException("No SHULKER_PROXY_TTL_SECONDS found in environment")
- val ttlSeconds = ttlSecondsStr.toLong()
-
- return Configuration(
- proxyNamespace,
- proxyName,
- ttlSeconds
- )
+ return Configuration(
+ proxyNamespace,
+ proxyName,
+ ttlSeconds
+ )
+ }
+ }
 }
diff --git a/...ker-proxy-agent-common/src/main/kotlin/io/shulkermc/proxyagent/ShulkerProxyAgentCommon.kt b/...ker-proxy-agent-common/src/main/kotlin/io/shulkermc/proxyagent/ShulkerProxyAgentCommon.kt
@@ -16,18 +16,18 @@ class ShulkerProxyAgentCommon(val proxyInterface: ProxyInterface, val logger: Lo
 
  fun onProxyInitialization() {
  try {
- val config = parse()
+ val config = Configuration.load()
 
  this.logger.info("Identified Shulker proxy: ${config.proxyNamespace}/${config.proxyName}")
 
  val fileSystem = FileSystemAdapterImpl()
  this.kubernetesGateway = KubernetesGatewayAdapterImpl(config.proxyNamespace, config.proxyName)
 
- DrainFeature(this, fileSystem, kubernetesGateway!!, config.ttlSeconds)
- DirectoryFeature(this, kubernetesGateway!!)
+ DrainFeature(this, fileSystem, this.kubernetesGateway!!, config.ttlSeconds)
+ DirectoryFeature(this, this.kubernetesGateway!!)
  LimboFeature(this)
 
- kubernetesGateway!!.emitAgentReady()
+ this.kubernetesGateway!!.emitAgentReady()
  } catch (e: Exception) {
  this.logger.severe("Failed to parse configuration")
  e.printStackTrace()

diff --git a/...agent-common/src/main/kotlin/io/shulkermc/proxyagent/api/adapters/DirectoryAdapterImpl.kt b/...agent-common/src/main/kotlin/io/shulkermc/proxyagent/api/adapters/DirectoryAdapterImpl.kt
@@ -27,13 +27,11 @@ class DirectoryAdapterImpl(
  fun unregisterServer(name: ServerName) {
  this.agent.logger.info("Unregistering server '$name' from directory")
 
- if (this.serversByTag.containsKey(name)) {
- val tags = this.tagsByServer[name]
- if (tags != null) {
- for (tag in tags) {
- this.serversByTag[tag]!!.remove(name)
- this.agent.logger.fine("Untagged '$tag' from server '${name}'")
- }
+ val tags = this.tagsByServer[name]
+ if (tags != null) {
+ tags.forEach { tag ->
+ this.serversByTag[tag]!!.remove(name)
+ this.agent.logger.fine("Untagged '$tag' from server '${name}'")
  }
  this.tagsByServer.remove(name)
  }

diff --git a/...er-proxy-agent-velocity/src/main/kotlin/io/shulkermc/proxyagent/ProxyInterfaceVelocity.kt b/...er-proxy-agent-velocity/src/main/kotlin/io/shulkermc/proxyagent/ProxyInterfaceVelocity.kt
@@ -36,7 +36,7 @@ class ProxyInterfaceVelocity(
  }
 
  override fun addServerPreConnectHook(hook: ServerPreConnectHook) {
- this.proxy.eventManager.register(plugin, ServerPreConnectEvent::class.java, PostOrder.LAST) { event ->
+ this.proxy.eventManager.register(this.plugin, ServerPreConnectEvent::class.java, PostOrder.LAST) { event ->
  val result = hook(this.wrapPlayer(event.player), event.originalServer.serverInfo.name)
 
  if (result.newServerName.isPresent)
@@ -45,7 +45,7 @@ class ProxyInterfaceVelocity(
  }
 
  override fun addPlayerPreLoginHook(hook: PlayerPreLoginHook) {
- this.proxy.eventManager.register(plugin, PreLoginEvent::class.java, PostOrder.FIRST) { event ->
+ this.proxy.eventManager.register(this.plugin, PreLoginEvent::class.java, PostOrder.FIRST) { event ->
  val result = hook()
 
  if (!result.allowed)