Merge branch 'master' of git.parisson.com:git/teleforma

diff --cc app/wsgi.ini
index 8fc4f63fe6eb40b78d0cfc0535054bfd5f5abbfa,25862cf3340b01a453cf792866a56d309cd01f09..0fba22ebb59c263e1a5d544d04b467f7cd6029d4
--- 1/app/wsgi.ini
--- 2/app/wsgi.ini
+++ b/app/wsgi.ini
@@@ -25,15 -25,15 +25,15 @@@ need-app = tru
  disable-logging = false              ; Disable built-in logging
  log-4xx = true                       ; but log 4xx's anyway
  log-5xx = true                       ; and 5xx's
 -logger = file:/var/log/app/app.log
 +logger = file:/var/log/uwsgi/uwsgi.log
  
 -harakiri = 300                       ; forcefully kill workers after 60 seconds
 +harakiri = 1000                       ; forcefully kill workers after 60 seconds
  #py-callos-afterfork = true            ; allow workers to trap signals
  
- #max-requests = 40000                 ; Restart workers after this many requests
- #max-worker-lifetime = 18000          ; Restart workers after this many seconds
+ max-requests = 40000                 ; Restart workers after this many requests
+ max-worker-lifetime = 36000          ; Restart workers after this many seconds
  reload-on-rss = 4096                 ; Restart workers after this much resident memory
 -worker-reload-mercy = 60             ; How long to wait before forcefully killing workers
 +worker-reload-mercy = 60O             ; How long to wait before forcefully killing workers
  
  # We don't expect abuse so lets have fastest respawn possible
  forkbomb-delay = 0