Browse Source

Stop sbt from dying after starting the container

Andreas C. Osowski 12 years ago
parent
commit
495129e1cd
2 changed files with 3 additions and 5 deletions
  1. 0 2
      lift-stateless/sbt.bat
  2. 3 3
      lift-stateless/setup.py

+ 0 - 2
lift-stateless/sbt.bat

@@ -1,2 +0,0 @@
-set SCRIPT_DIR=%~dp0
-java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.jar" %*

+ 3 - 3
lift-stateless/setup.py

@@ -7,18 +7,18 @@ import os
 def start(args):
 def start(args):
   setup_util.replace_text("lift-stateless/src/main/resources/props/default.props", "jdbc:mysql:\/\/.*:3306", "jdbc:mysql://" + args.database_host + ":3306")
   setup_util.replace_text("lift-stateless/src/main/resources/props/default.props", "jdbc:mysql:\/\/.*:3306", "jdbc:mysql://" + args.database_host + ":3306")
 
 
-  subprocess.Popen("./sbt update container:start", shell=True, cwd="lift-stateless")
+  subprocess.Popen("./sbt update ~container:start", shell=True, cwd="lift-stateless")
 
 
   return 0
   return 0
 def stop():
 def stop():
   p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
   p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
   out, err = p.communicate()
   out, err = p.communicate()
   for line in out.splitlines():
   for line in out.splitlines():
-    if './start' in line or ('play' in line and 'java' in line):
+    if './sbt' in line:
       pid = int(line.split(None, 2)[1])
       pid = int(line.split(None, 2)[1])
       os.kill(pid, 9)
       os.kill(pid, 9)
   try:
   try:
-    os.remove("play-scala/RUNNING_PID")
+    os.remove("lift-stateless/RUNNING_PID")
   except OSError:
   except OSError:
     pass
     pass