X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=gunicorn.conf.py;h=0f1d93a8638532beb0b13b858c91c643664451e4;hb=11dd44ec360d4130c824bda10bd2bee1f8a31a2c;hp=c575d53875fde7787464dae8cbad23a8dbbd5325;hpb=ba178be7c0828dc0df33b0d22347cc9e92dbb574;p=odoo%2Fodoo.git

diff --git a/gunicorn.conf.py b/gunicorn.conf.py
index c575d53..0f1d93a 100644
--- a/gunicorn.conf.py
+++ b/gunicorn.conf.py
@@ -1,11 +1,15 @@
 # Gunicorn sample configuration file.
 # See http://gunicorn.org/configure.html for more details.
 #
-# To run OpenERP via Gunicorn, change the appropriate
+# To run the OpenERP server via Gunicorn, change the appropriate
 # settings below, in order to provide the parameters that
 # would normally be passed in the command-line,
 # (at least `bind` and `conf['addons_path']`), then execute:
-#  $ gunicorn openerp:wsgi.application -c gunicorn.conf.py
+#   $ gunicorn openerp:wsgi.core.application -c gunicorn.conf.py
+# or if you want to run it behind a reverse proxy, add the line
+#   import openerp.wsgi.proxied
+# in this file and execute:
+#   $ gunicorn openerp:wsgi.proxied.application -c gunicorn.conf.py
 
 import openerp
 
@@ -17,17 +21,19 @@ pidfile = '.gunicorn.pid'
 # Gunicorn recommends 2-4 x number_of_cpu_cores, but
 # you'll want to vary this a bit to find the best for your
 # particular work load.
-workers = 1
+workers = 4
 
 # Some application-wide initialization is needed.
-on_starting = openerp.wsgi.on_starting
-when_ready = openerp.wsgi.when_ready
+on_starting = openerp.wsgi.core.on_starting
+when_ready = openerp.wsgi.core.when_ready
+pre_request = openerp.wsgi.core.pre_request
+post_request = openerp.wsgi.core.post_request
 
 # openerp request-response cycle can be quite long for
 # big reports for example
 timeout = 240
 
-#max_requests = 150
+max_requests = 2000
 
 # Equivalent of --load command-line option
 openerp.conf.server_wide_modules = ['web']
@@ -37,7 +43,7 @@ conf = openerp.tools.config
 
 # Path to the OpenERP Addons repository (comma-separated for
 # multiple locations)
-conf['addons_path'] = '/home/thu/repos/addons/trunk,/home/thu/repos/web/trunk/addons,/home/thu/repos/server/trunk-limits/openerp/tests/addons'
+conf['addons_path'] = '/home/openerp/addons/trunk,/home/openerp/web/trunk/addons'
 
 # Optional database config if not using local socket
 #conf['db_name'] = 'mycompany'
@@ -54,33 +60,4 @@ conf['addons_path'] = '/home/thu/repos/addons/trunk,/home/thu/repos/web/trunk/ad
 # If --static-http-enable is used, path for the static web directory
 #conf['static_http_document_root'] = '/var/www'
 
-def time_expired(n, stack):
-    import os
-    import time
-    print '>>> [%s] time ran out.' % (os.getpid())
-    raise Exception('(time ran out)')
-
-def pre_request(worker, req):
-    import os
-    import psutil
-    import resource
-    import signal
-    # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space
-    rss, vms = psutil.Process(os.getpid()).get_memory_info()
-    soft, hard = resource.getrlimit(resource.RLIMIT_AS)
-    print ">>>>>> [%s] %s %s %s %s %s" % (os.getpid(), vms, req.method, req.path, req.query, req.fragment)
-    print ">>>>>>   %s" % (req.body,)
-    # Let's say 512MB is ok, 768 is a hard limit (will raise MemoryError),
-    # 640 will nicely restart the process.
-    resource.setrlimit(resource.RLIMIT_AS, (768 * 1024 * 1024, hard))
-    if vms > 640 * 1024 * 1024:
-        print ">>> Worker eating too much memory, reset it after the request."
-        worker.alive = False # Commit suicide after the request.
-
-    r = resource.getrusage(resource.RUSAGE_SELF)
-    cpu_time = r.ru_utime + r.ru_stime
-    signal.signal(signal.SIGXCPU, time_expired)
-    soft, hard = resource.getrlimit(resource.RLIMIT_CPU)
-    resource.setrlimit(resource.RLIMIT_CPU, (cpu_time + 15, hard))
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: