Browse Source

Fixed an error in the setup script that wasn't shutting down play correctly

Patrick Falls 12 years ago
parent
commit
c74be224a1
2 changed files with 3 additions and 3 deletions
  1. 2 2
      play-java/setup.py
  2. 1 1
      play-scala/setup.py

+ 2 - 2
play-java/setup.py

@@ -17,7 +17,7 @@ def stop():
   p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
   out, err = p.communicate()
   for line in out.splitlines():
-    if 'play' in line and 'java' in line:
+    if './start' in line or ('play' in line and 'java' in line):   
       pid = int(line.split(None, 2)[1])
       os.kill(pid, 9)
   try:
@@ -25,4 +25,4 @@ def stop():
   except OSError:
     pass
     
-  return 0
+  return 0

+ 1 - 1
play-scala/setup.py

@@ -17,7 +17,7 @@ def stop():
   p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
   out, err = p.communicate()
   for line in out.splitlines():
-    if 'play' in line and 'scala' in line:
+    if './start' in line or ('play' in line and 'java' in line):
       pid = int(line.split(None, 2)[1])
       os.kill(pid, 9)
   try: