Browse Source

Update sort order for ringo tests. Add ringo-sqlstore to installer

Patrick Falls 12 years ago
parent
commit
e2bad23247
4 changed files with 6 additions and 3 deletions
  1. 1 0
      installer.py
  2. 1 1
      ringojs-convinient/benchmark_config
  3. 2 0
      ringojs-convinient/setup.py
  4. 2 2
      ringojs/benchmark_config

+ 1 - 0
installer.py

@@ -126,6 +126,7 @@ class Installer:
     self.__run_command("sudo ringo-admin install oberhamsi/sql-ringojs-client")
     self.__run_command("sudo ringo-admin install ringo/stick")
     self.__run_command("sudo ringo-admin install oberhamsi/reinhardt")
+    self.__run_command("sudo ringo-admin install grob/ringo-sqlstore")
 
     #######################################
     # Webservers

+ 1 - 1
ringojs-convinient/benchmark_config

@@ -8,7 +8,7 @@
       "query_url": "/db/",
       "fortune_url": "/fortune",
       "port": 8080,
-      "sort": 78
+      "sort": 75
     }
   }]
 }

+ 2 - 0
ringojs-convinient/setup.py

@@ -8,6 +8,8 @@ def start(args):
   setup_util.replace_text("ringojs-convinient/app/models.js", "dbHost = '.*';", "dbHost = '" + args.database_host + "';")
 
   try:
+    subprocess.check_call("sudo mkdir -p /usr/share/ringojs/packages/ringo-sqlstore/jars/", shell=True)
+    
     subprocess.check_call("sudo cp /usr/share/ringojs//packages/sql-ringojs-client/jars/mysql.jar /usr/share/ringojs/packages/ringo-sqlstore/jars/", shell=True)
     subprocess.Popen("ringo --production ringo-main.js", shell=True, cwd="ringojs-convinient")
     return 0

+ 2 - 2
ringojs/benchmark_config

@@ -5,7 +5,7 @@
       "setup_file": "setup",
       "json_url": "/json",
       "port": 8080,
-      "sort": 72
+      "sort": 73
     },
     "raw": {
       "setup_file": "setup",
@@ -13,7 +13,7 @@
       "query_url": "/db?queries=",
       "fortune_url": "/fortune",
       "port": 8080,
-      "sort": 73
+      "sort": 74
     }
   }]
 }