Made some minor adjustments to the setup file. Also modified the benchmark_config file so that there's a 'raw' version for the database tests only

tornado/benchmark_config

@@ -1,13 +1,18 @@
 {
-  "framework": "tornado-raw",
+  "framework": "tornado",
   "tests": [{
     "default": {
       "setup_file": "setup",
       "json_url": "/json",
+      "port": 8080,
+      "sort": 52
+    },
+    "raw": {
+      "setup_file": "setup",
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 44
+      "sort": 53
     }
   }]
 }

tornado/deploy/nginx.conf

@@ -1,8 +1,8 @@
-user nginx;
+#user nginx;
 worker_processes 1;
 
-error_log /var/log/nginx/error.log;
-pid /var/run/nginx.pid;
+#error_log /var/log/nginx/error.log;
+#pid /var/run/nginx.pid;
 
 events {
     worker_connections 1024;
@@ -22,7 +22,7 @@ http {
         server 127.0.0.1:8007;
     }
 
-    include /etc/nginx/mime.types;
+    include /usr/local/nginx/conf/mime.types;
     default_type application/octet-stream;
 
     # access_log /var/log/nginx/access.log;
@@ -32,12 +32,12 @@ http {
     sendfile on;
     tcp_nopush on;
     tcp_nodelay on;
-    gzip on;
-    gzip_min_length 1000;
-    gzip_proxied any;
-    gzip_types text/plain text/html text/css text/xml
-               application/x-javascript application/xml
-               application/atom+xml text/javascript;
+    #gzip on;
+    #gzip_min_length 1000;
+    #gzip_proxied any;
+    #gzip_types text/plain text/html text/css text/xml
+    #           application/x-javascript application/xml
+    #           application/atom+xml text/javascript;
 
     # Only retry if there was a communication error, not a timeout
     # on the Tornado server (to avoid propagating "queries of death"
@@ -50,7 +50,7 @@ http {
         location / {
             proxy_pass_header Server;
             proxy_set_header Host $http_host;
-            proxy_redirect false;
+            proxy_redirect off;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Scheme $scheme;
             proxy_pass http://frontends;

tornado/setup.py

@@ -12,7 +12,7 @@ def start(args):
     setup_util.replace_text(
         cwd + "/server.py", "127.0.0.1", args.database_host)
 
-    subprocess.check_call("pip install -r %s/requirements.txt")
+    subprocess.check_call("sudo pip install -r requirements.txt", cwd=cwd, shell=True)
 
     subprocess.Popen("python %s/FrameworkBenchmarks/tornado/server.py --port=8000 --logging=error" % home, shell=True, cwd=cwd)
     subprocess.Popen("python %s/FrameworkBenchmarks/tornado/server.py --port=8001 --logging=error" % home, shell=True, cwd=cwd)
@@ -22,7 +22,7 @@ def start(args):
     subprocess.Popen("python %s/FrameworkBenchmarks/tornado/server.py --port=8005 --logging=error" % home, shell=True, cwd=cwd)
     subprocess.Popen("python %s/FrameworkBenchmarks/tornado/server.py --port=8006 --logging=error" % home, shell=True, cwd=cwd)
     subprocess.Popen("python %s/FrameworkBenchmarks/tornado/server.py --port=8007 --logging=error" % home, shell=True, cwd=cwd)
-    subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c " + home + "/FrameworkBenchmarks/php/deploy/nginx.conf", shell=True)
+    subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c " + home + "/FrameworkBenchmarks/tornado/deploy/nginx.conf", shell=True)
 
     return 0
 
@@ -41,10 +41,10 @@ def stop():
     out, err = p.communicate()
     for line in out.splitlines():
         if 'server.py' in line:
-            try:
-                pid = int(line.split(None, 2)[1])
-                os.kill(pid, 9)
-            except OSError:
-                pass
+            #try:
+            pid = int(line.split(None, 2)[1])
+            os.kill(pid, 9)
+            #except OSError:
+            #    pass
 
     return 0