Browse Source

update setup file to point to play-scala-mongodb

Patrick Falls 12 years ago
parent
commit
848a7374c4
2 changed files with 9 additions and 10 deletions
  1. 3 3
      play-scala-mongodb/benchmark_config
  2. 6 7
      play-scala-mongodb/setup.py

+ 3 - 3
play-scala-mongodb/benchmark_config

@@ -1,12 +1,12 @@
 {
 {
-  "framework": "play-scala-reactivemongo",
+  "framework": "play-scala",
   "tests": [{
   "tests": [{
-    "default": {
+    "mongodb": {
       "setup_file": "setup",
       "setup_file": "setup",
       "db_url": "/db",
       "db_url": "/db",
       "query_url": "/db?queries=",
       "query_url": "/db?queries=",
       "port": 9000,
       "port": 9000,
-      "sort": 73
+      "sort": 83
     }
     }
   }]
   }]
 }
 }

+ 6 - 7
play-scala-mongodb/setup.py

@@ -5,13 +5,12 @@ import setup_util
 import os
 import os
 
 
 def start(args):
 def start(args):
-  setup_util.replace_text("play-scala/conf/application.conf", "jdbc:mysql:\/\/.*:3306", "jdbc:mysql://" + args.database_host + ":3306")
-  setup_util.replace_text("play-scala/conf/application.conf", "[\"localhost:27017\"]", "[\"" + args.database_host + ":27017\"]")
+  setup_util.replace_text("play-scala-mongodb/conf/application.conf", "localhost:27017", "" + args.database_host + ":27017")
 
 
-  subprocess.check_call("play dist", shell=True, cwd="play-scala")
-  subprocess.check_call("unzip play-scala-1.0-SNAPSHOT.zip", shell=True, cwd="play-scala/dist")
-  subprocess.check_call("chmod +x start", shell=True, cwd="play-scala/dist/play-scala-1.0-SNAPSHOT")
-  subprocess.Popen("./start", shell=True, cwd="play-scala/dist/play-scala-1.0-SNAPSHOT")
+  subprocess.check_call("play dist", shell=True, cwd="play-scala-mongodb")
+  subprocess.check_call("unzip play-scala-1.0-SNAPSHOT.zip", shell=True, cwd="play-scala-mongodb/dist")
+  subprocess.check_call("chmod +x start", shell=True, cwd="play-scala-mongodb/dist/play-scala-1.0-SNAPSHOT")
+  subprocess.Popen("./start", shell=True, cwd="play-scala-mongodb/dist/play-scala-1.0-SNAPSHOT")
 
 
   return 0
   return 0
 def stop():
 def stop():
@@ -22,7 +21,7 @@ def stop():
       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("play-scala-mongodb/RUNNING_PID")
   except OSError:
   except OSError:
     pass
     pass