make sure parent monitor is started in interactive mode. Fix for GRAILS-10501

Author: graemerocher

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/fork/ForkedGrailsProcess.groovy

@@ -293,38 +293,30 @@ abstract class ForkedGrailsProcess {
                     GrailsConsole.instance.updateStatus("Running without daemon...")
                 }
 
-                ServerSocket parentAvailabilityServer = startParentAvailabilityServer()
-
-                try {
-                    String classpathString = getBoostrapClasspath(executionContext)
-                    List<String> cmd = buildProcessCommand(executionContext, classpathString)
+                startParentAvailabilityServer()
 
+                String classpathString = getBoostrapClasspath(executionContext)
+                List<String> cmd = buildProcessCommand(executionContext, classpathString)
 
-                    def processBuilder = new ProcessBuilder()
-                    processBuilder
-                        .directory(executionContext.getBaseDir())
-                        .redirectErrorStream(false)
-                        .command(cmd)
 
-                    def process = processBuilder.start()
+                def processBuilder = new ProcessBuilder()
+                processBuilder
+                    .directory(executionContext.getBaseDir())
+                    .redirectErrorStream(false)
+                    .command(cmd)
 
-                    if (isForkingReserveEnabled()) {
-                        List<String> reserveCmd = buildProcessCommand(executionContext, classpathString, true)
-                        forkReserveProcess(reserveCmd, executionContext)
-                    }
-                    else if(shouldRunWithDaemon()) {
-                        GrailsConsole.instance.updateStatus("Starting daemon...")
-                        forkDaemon(executionContext)
-                    }
+                def process = processBuilder.start()
 
-                    return attachOutputListener(process)
-                } finally {
-                    try {
-                        parentAvailabilityServer?.close()
-                    } catch (e) {
-                        // ignore
-                    }
+                if (isForkingReserveEnabled()) {
+                    List<String> reserveCmd = buildProcessCommand(executionContext, classpathString, true)
+                    forkReserveProcess(reserveCmd, executionContext)
                 }
+                else if(shouldRunWithDaemon()) {
+                    GrailsConsole.instance.updateStatus("Starting daemon...")
+                    forkDaemon(executionContext)
+                }
+
+                return attachOutputListener(process)
             }
             else {
                 return null
@@ -333,11 +325,19 @@ abstract class ForkedGrailsProcess {
         }
     }
 
-    protected ServerSocket startParentAvailabilityServer() {
+    protected void startParentAvailabilityServer() {
+        if(System.getProperty(PARENT_PROCESS_PORT)) return
+
         ServerSocket parentAvailabilityServer = new ServerSocket(0)
         def parentPort = parentAvailabilityServer.localPort
         System.setProperty(PARENT_PROCESS_PORT, String.valueOf(parentPort))
-        parentAvailabilityServer
+        Runtime.addShutdownHook {
+            try {
+                parentAvailabilityServer?.close()
+            } catch (e) {
+                // ignore
+            }
+        }
     }
 
     @CompileStatic
@@ -394,6 +394,8 @@ abstract class ForkedGrailsProcess {
             discoverAndSetAgent(executionContext)
         }
 
+        startParentPortMonitor()
+
         final console = GrailsConsole.instance
         console.updateStatus("Stopping daemon...")
         while(isDaemonRunning()) {