Just a tiny bit of cleanup

src/inworldz/maestro/GridServices.py

@@ -115,13 +115,11 @@ def Start(self, restart=False, delay=60):
     def Terminate(self):
         self.shouldBeRunning = False
 
-        """ Shutdown the region after sending an Alert and delaying for a specified interval """
+        """ Shutdown the service immediately but safely. """
         p = provision._findServiceProcess(self.exe_name)
         if (p == None):
             return (True)
-        p.terminate()
-        p = provision._findServiceProcess(self.exe_name)
-        return (p == None)
+        return inworldz.util.process.TerminateAndWaitForConfirmation(p, 30)
 
 
     def ConsoleCommand(self, command):

src/inworldz/maestro/Region.py

@@ -439,14 +439,13 @@ def Start(self, restart=False, delay=60):
         """ Requests a start/restart of the managed sim node with an alert and a delay.
             If restart is False nothing is done if we are already running.  If True and the
             region is running an alert is sent and the region restarted after the delay. """
-        p = provision._findRegionProcess(self.slot_number)
-        if p != None:
+        if self.IsRunning():
             if (restart == False):
                 return (True)
             else:
                 self.Shutdown(delay)
 
-        """" Make sure there is a region config here... """
+        # TODO: Make sure there is a region config here...
 
         bindir = os.path.join(self.slot_directory, "bin")
         exename = os.path.join(bindir, self.exe_name)
@@ -460,13 +459,12 @@ def Start(self, restart=False, delay=60):
             return False
 
     def Terminate(self):
-        """ Shutdown the region after sending an Alert and delaying for a specified interval """
+        """ Shutdown the region immediately but safely. """
         p = provision._findRegionProcess(self.slot_number)
-        if (p == None):
-            return (True)
-        p.terminate()
-
-        if inworldz.util.process.WaitForProcessTermination(p, 30):
+        if p == None:
+            return True
+
+        if inworldz.util.process.TerminateAndWaitForConfirmation(p, 30):
             self.ChangeState(RegionState.DeployedStopped)
             return True
         else:

src/inworldz/util/process.py

@@ -29,6 +29,10 @@ def WaitForProcessTermination(process, timeout):
     else:
         return True
 
+def TerminateAndWaitForConfirmation(process, timeout):
+    process.terminate() # This sends CTRL-C, which will cause an immediate shutdown.
+    return WaitForProcessTermination(process, timeout)
+
 def DumpThreadStacks(pid):
     sddir = os.path.dirname(sys.argv[0])
     p = psutil.Popen([os.path.join(sddir, "stackdump.exe"), str(pid)],