Early exit for TomcatExecutionListener (#189)

* Early exit in Tomcat listener * Changelog entry
metalbear-co · Oct 27, 2023 · a09d1ad · a09d1ad
1 parent 8955b2f
commit a09d1ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/changelog.d/188.internal.md b/changelog.d/188.internal.md
@@ -0,0 +1 @@
+`TomcatExecutionListener` does not save/restore environment when mirrord is disabled.
diff --git a/...s/tomcat/src/main/kotlin/com/metalbear/mirrord/products/tomcat/TomcatExecutionListener.kt b/...s/tomcat/src/main/kotlin/com/metalbear/mirrord/products/tomcat/TomcatExecutionListener.kt
@@ -52,17 +52,17 @@ class TomcatExecutionListener : ExecutionListener {
             }
 
             try {
-                val mirrordEnv = service.execManager.wrapper("idea").apply {
+                service.execManager.wrapper("idea").apply {
                     this.wsl = wsl
                     configFromEnv = envVars.find { e -> e.name == CONFIG_ENV_NAME }?.VALUE
-                }.start()?.first?.let { it + mapOf(Pair("MIRRORD_DETECT_DEBUGGER_PORT", "javaagent")) }.orEmpty().toMutableMap()
-
-                // This should allow clean shutdown of the app even if `outgoing` feature is enabled.
-                mirrordEnv["MIRRORD_IGNORE_DEBUGGER_PORTS"] = getTomcatServerPort()
-
-                savedEnvs[executorId] = envVars.toList()
-                envVars.addAll(mirrordEnv.map { (k, v) -> EnvironmentVariable(k, v, false) })
-                config.setEnvironmentVariables(envVars)
+                }.start()?.first?.let {
+                    // `MIRRORD_IGNORE_DEBUGGER_PORTS` should allow clean shutdown of the app
+                    // even if `outgoing` feature is enabled.
+                    val mirrordEnv = it + mapOf(Pair("MIRRORD_DETECT_DEBUGGER_PORT", "javaagent"), Pair("MIRRORD_IGNORE_DEBUGGER_PORTS", getTomcatServerPort()))
+                    savedEnvs[executorId] = envVars.toList()
+                    envVars.addAll(mirrordEnv.map { (k, v) -> EnvironmentVariable(k, v, false) })
+                    config.setEnvironmentVariables(envVars)
+                }
             } catch (_: Throwable) {
                 // Error notifications were already fired.
                 // We can't abort the execution here, so we let the app run without mirrord.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		`TomcatExecutionListener` does not save/restore environment when mirrord is disabled.