osmoutil: try to terminate process instead of killing

Change-Id: Iaa978467b140e3d6dc5a2a6d8966282e64630ce7

1 files changed, 12 insertions, 2 deletions

diff --git a/osmopy/osmoutil.py b/osmopy/osmoutil.py
index bb03614..7b20043 100755
--- a/osmopy/osmoutil.py
+++ b/osmopy/osmoutil.py
@@ -18,6 +18,7 @@ import subprocess
 import os
 import sys
 import importlib
+import time
 
 
 """Run a command, with stdout and stderr directed to devnull"""
@@ -36,9 +37,18 @@ If the process doesn't appear to exist (for instance, is None), do nothing"""
 
 
 def end_proc(proc):
-    if proc:
+    if not proc:
+        return
+
+    proc.terminate()
+    time.sleep(.1)
+    rc = proc.poll()
+    if rc is not None:
+        print "Terminated child process"
+    else:
         proc.kill()
-        proc.wait()
+        print "Killed child process"
+    proc.wait()
 
 
 """Add a directory to sys.path, try to import a config file."""