diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-09-21 13:09:12 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-09-21 13:09:12 +0000 |
| commit | 199eb8dde3ca3801fac5b4cabee85241f549b39b (patch) | |
| tree | 68b8de0e056470ab9206a43dd6930118624e34ca /odoo/tools/config.py | |
| parent | b3a3ad80991265c50f38fd20588df9a69b6bcf67 (diff) | |
| parent | d23601cc6710f23e80f0e47b2692521de011c083 (diff) | |
[MERGE] forward port branch saas-15 up to d23601cc671
closes odoo/odoo#27156
Diffstat (limited to 'odoo/tools/config.py')
| -rw-r--r-- | odoo/tools/config.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/odoo/tools/config.py b/odoo/tools/config.py index 57b66b50f6a..62a633808b0 100644 --- a/odoo/tools/config.py +++ b/odoo/tools/config.py @@ -285,10 +285,12 @@ class configmanager(object): help="Specify the number of workers, 0 disable prefork mode.", type="int") group.add_option("--limit-memory-soft", dest="limit_memory_soft", my_default=2048 * 1024 * 1024, - help="Maximum allowed virtual memory per worker, when reached the worker be reset after the current request (default 671088640 aka 640MB).", + help="Maximum allowed virtual memory per worker, when reached the worker be " + "reset after the current request (default 2048MiB).", type="int") group.add_option("--limit-memory-hard", dest="limit_memory_hard", my_default=2560 * 1024 * 1024, - help="Maximum allowed virtual memory per worker, when reached, any memory allocation will fail (default 805306368 aka 768MB).", + help="Maximum allowed virtual memory per worker, when reached, any memory " + "allocation will fail (default 2560MiB).", type="int") group.add_option("--limit-time-cpu", dest="limit_time_cpu", my_default=60, help="Maximum allowed CPU time per request (default 60).", |