Browse Source

flask-pypy: Remove gunicorn.

INADA Naoki 11 years ago
parent
commit
c2fe5ff786
2 changed files with 7 additions and 9 deletions
  1. 3 3
      flask/benchmark_config
  2. 4 6
      flask/setup_pypy.py

+ 3 - 3
flask/benchmark_config

@@ -60,7 +60,7 @@
       "framework": "flask",
       "framework": "flask",
       "language": "Python",
       "language": "Python",
       "orm": "Full",
       "orm": "Full",
-      "platform": "Gunicorn/Meinheld",
+      "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
@@ -83,7 +83,7 @@
       "framework": "flask",
       "framework": "flask",
       "language": "Python",
       "language": "Python",
       "orm": "Full",
       "orm": "Full",
-      "platform": "Gunicorn/Tornado",
+      "platform": "Tornado",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
@@ -104,7 +104,7 @@
       "framework": "flask",
       "framework": "flask",
       "language": "Python",
       "language": "Python",
       "orm": "Raw",
       "orm": "Raw",
-      "platform": "Gunicorn/Tornado",
+      "platform": "Tornado",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 4 - 6
flask/setup_pypy.py

@@ -13,15 +13,13 @@ def start(args, logfile, errfile):
     global proc
     global proc
     setup_util.replace_text("flask/app.py", "DBHOSTNAME", args.database_host)
     setup_util.replace_text("flask/app.py", "DBHOSTNAME", args.database_host)
     proc = subprocess.Popen([
     proc = subprocess.Popen([
-        bin_dir + "/gunicorn",
-        "app:app",
-        '-k', 'tornado',
-        "-b", "0.0.0.0:8080",
-        '-w', str(NCPU*3),
-        "--log-level=critical"],
+        bin_dir + "/pypy", "serve_tornado.py",
+        "--port=8080",
+        "--procs="+ str(NCPU*3)],
         cwd="flask", stderr=errfile, stdout=logfile)
         cwd="flask", stderr=errfile, stdout=logfile)
     return 0
     return 0
 
 
+
 def stop(logfile, errfile):
 def stop(logfile, errfile):
     global proc
     global proc
     if proc is None:
     if proc is None: