Browse Source

Revert "flask-pypy: Remove gunicorn."

This reverts commit c2fe5ff786544a0ede3dd785fecdacd209c49640.
INADA Naoki 11 years ago
parent
commit
04693044bd
2 changed files with 9 additions and 7 deletions
  1. 3 3
      flask/benchmark_config
  2. 6 4
      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": "Meinheld",
+      "platform": "Gunicorn/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": "Tornado",
+      "platform": "Gunicorn/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": "Tornado",
+      "platform": "Gunicorn/Tornado",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 6 - 4
flask/setup_pypy.py

@@ -13,13 +13,15 @@ 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 + "/pypy", "serve_tornado.py",
-        "--port=8080",
-        "--procs="+ str(NCPU*3)],
+        bin_dir + "/gunicorn",
+        "app:app",
+        '-k', 'tornado',
+        "-b", "0.0.0.0:8080",
+        '-w', str(NCPU*3),
+        "--log-level=critical"],
         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: