瀏覽代碼

Fix some aspnet validation errors

Hamilton Turner 11 年之前
父節點
當前提交
e973a87806

+ 2 - 0
frameworks/C#/aspnet/benchmark_config

@@ -260,6 +260,8 @@
     },
     "mono-mysql-raw": {
       "setup_file": "setup_nginx",
+      "json_url": "/json/default",
+      "plaintext_url": "/plaintext",
       "db_url": "/ado/mysql",
       "query_url": "/ado/mysql?queries=",
       "fortune_url": "/ado/mysql/fortunes",

+ 5 - 7
frameworks/C#/aspnet/setup_nginx.py

@@ -3,13 +3,11 @@ import sys
 import setup_util
 import os
 
-root = os.getcwd() + "/aspnet"
-app = root + "/src"
-
 def start(args, logfile, errfile):
   if os.name == 'nt':
     return 1
   
+  app = args.fwroot + "/aspnet/src"
   setup_util.replace_text(app + "/Web.config", "localhost", args.database_host)
 
   try:
@@ -20,8 +18,8 @@ def start(args, logfile, errfile):
     
     # nginx
     workers = 'worker_processes ' + str(args.max_threads) + ';'
-    subprocess.check_call('echo "upstream mono {\n' + ';\n'.join('\tserver 127.0.0.1:' + str(port) for port in range(9001, 9001 + args.max_threads)) + ';\n}" > ' + root + '/nginx.upstream.conf', shell=True, stderr=errfile, stdout=logfile);
-    subprocess.check_call('sudo /usr/local/nginx/sbin/nginx -c ' + root + '/nginx.conf -g "' + workers + '"', shell=True, stderr=errfile, stdout=logfile)
+    subprocess.check_call('echo "upstream mono {\n' + ';\n'.join('\tserver 127.0.0.1:' + str(port) for port in range(9001, 9001 + args.max_threads)) + ';\n}" > $TROOT/nginx.upstream.conf', shell=True, stderr=errfile, stdout=logfile);
+    subprocess.check_call('sudo /usr/local/nginx/sbin/nginx -c $TROOT/nginx.conf -g "' + workers + '"', shell=True, stderr=errfile, stdout=logfile)
     
     # fastcgi
     for port in range(9001, 9001 + args.max_threads):
@@ -34,8 +32,8 @@ def stop(logfile, errfile):
   if os.name == 'nt':
     return 0
   
-  subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c " + root + "/nginx.conf -s stop", shell=True, stderr=errfile, stdout=logfile)
-  subprocess.check_call("rm -f " + root + "/nginx.upstream.conf", shell=True, stderr=errfile, stdout=logfile)
+  subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c $TROOT/nginx.conf -s stop", shell=True, stderr=errfile, stdout=logfile)
+  subprocess.check_call("rm -f $TROOT/nginx.upstream.conf", shell=True, stderr=errfile, stdout=logfile)
   #
   # stop mono
   #

+ 3 - 3
frameworks/C#/aspnet/src/Controllers/JsonController.cs

@@ -8,17 +8,17 @@ namespace Benchmarks.AspNet.Controllers
     {
         public ActionResult Default()
         {
-            return new JsonResult { Data = new { message = "Hello World" } };
+            return new JsonResult { Data = new { message = "Hello, World!" } };
         }
 
         public ActionResult JsonNet()
         {
-            return new JsonNetResult { Data = new { message = "Hello World" } };
+            return new JsonNetResult { Data = new { message = "Hello, World!" } };
         }
 
         public ActionResult ServiceStack()
         {
-            return new ServiceStackResult { Data = new { message = "Hello World" } };
+            return new ServiceStackResult { Data = new { message = "Hello, World!" } };
         }
     }