changeset 3965:5aa571d559bf

merged dev into stable
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 07 Jun 2013 20:01:57 +0200
parents 60900e877b31 (current diff) 8c11a295d131 (diff)
children 33e36ad0a61e
files development.ini production.ini rhodecode/config/deployment.ini_tmpl
diffstat 3 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/development.ini	Fri Jun 07 19:31:29 2013 +0200
+++ b/development.ini	Fri Jun 07 20:01:57 2013 +0200
@@ -59,6 +59,9 @@
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
 #max_requests = 5
+## ammount of time a worker can handle request before it get's killed and
+## restarted
+#timeout = 3600
 
 ## COMMON ##
 host = 0.0.0.0
--- a/production.ini	Fri Jun 07 19:31:29 2013 +0200
+++ b/production.ini	Fri Jun 07 20:01:57 2013 +0200
@@ -59,6 +59,9 @@
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
 #max_requests = 5
+## ammount of time a worker can handle request before it get's killed and
+## restarted
+#timeout = 3600
 
 ## COMMON ##
 host = 127.0.0.1
--- a/rhodecode/config/deployment.ini_tmpl	Fri Jun 07 19:31:29 2013 +0200
+++ b/rhodecode/config/deployment.ini_tmpl	Fri Jun 07 20:01:57 2013 +0200
@@ -59,6 +59,9 @@
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
 #max_requests = 5
+## ammount of time a worker can handle request before it get's killed and
+## restarted
+#timeout = 3600
 
 ## COMMON ##
 host = 127.0.0.1