Using the correct username and password for our tests

finagle/benchmark_config

@@ -2,12 +2,12 @@
     "framework" : "finagle",
     "tests" : [{
         "default" : {
-            "setup_file" : "setup.py",
+            "setup_file" : "setup",
             "json_url" : "/json",
             "db_url" : "/db",
             "query_url" : "/db?queries=",
             "port": 8080,
-            "sort": 42
+            "sort": 44
             }
         }
         ]

finagle/setup.py

@@ -2,13 +2,14 @@
 import subprocess
 import sys
 import time
+import os
 
 def start(args=None):
 
 
     
     subprocess.check_call("./sbt update compile", shell=True, cwd="finagle")
-    subprocess.Popen("nohup ./sbt -Ddb.host=" + args.database_host + " run &", cwd="finagle", shell=True)
+    subprocess.Popen("./sbt -Ddb.host=" + args.database_host + " run", cwd="finagle", shell=True)
     time.sleep(5)
     return 0
 

finagle/src/main/scala/com/falmarri/finagle/Finagle.scala

@@ -45,7 +45,7 @@ object FinagleBenchmark extends App {
 //  }
   
   
-  val database = Database.forURL("jdbc:mysql://" + System.getProperty("db.host", "localhost") + ":3306/hello_world", user = "root", driver="com.mysql.jdbc.Driver")
+  val database = Database.forURL("jdbc:mysql://" + System.getProperty("db.host", "localhost") + ":3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true", user = "benchmarkdbuser", password = "benchmarkdbpass", driver="com.mysql.jdbc.Driver")
   
   def serialize(value: Any) = {
     val writer = new StringWriter()
@@ -98,4 +98,4 @@ object FinagleBenchmark extends App {
     .name("finagle")
     .build(service)
 
-}
+}