Merge pull request voxpupuli#138 from derektamsen/20141030-add_gunicorn_timout_var

stankevich · stankevich · commit 252020b89fb0 · 2014-10-30T16:44:25.000-04:00
adding python::gunicorn template timeout var with default of 30 sec
diff --git a/README.md b/README.md
@@ -176,6 +176,8 @@ Manages Gunicorn virtual hosts.
 
 **osenv** - Allows setting environment variables for the gunicorn service. Accepts a hash of 'key': 'value' pairs. Default: false
 
+**timeout** - Allows setting the gunicorn idle worker process time before being killed. The unit of time is seconds. Default: 30
+
 **template** - Which ERB template to use. Default: python/gunicorn.erb
 
 ```puppet
@@ -188,6 +190,7 @@ Manages Gunicorn virtual hosts.
     environment => 'prod',
     appmodule   => 'app:app',
     osenv       => { 'DBHOST' => 'dbserver.example.com' },
+    timeout     => 30,
     template    => 'python/gunicorn.erb',
   }
 ```
diff --git a/manifests/gunicorn.pp b/manifests/gunicorn.pp
@@ -34,6 +34,11 @@
 #  hash of 'key': 'value' pairs.
 #  Default: false
 #
+# [*timeout*]
+#  Allows setting the gunicorn idle worker process time before being killed.
+#  The unit of time is seconds.
+#  Default: 30
+#
 # [*template*]
 #  Which ERB template to use. Default: python/gunicorn.erb
 #
@@ -50,6 +55,7 @@
 #   group       => 'www-data',
 #   appmodule   => 'app:app',
 #   osenv       => { 'DBHOST' => 'dbserver.example.com' },
+#   timeout     => 30,
 #   template    => 'python/gunicorn.erb',
 # }
 #
@@ -70,6 +76,7 @@
   $group         = 'www-data',
   $appmodule     = 'app:app',
   $osenv         = false,
+  $timeout       = 30,
   $template      = 'python/gunicorn.erb',
 ) {
 
diff --git a/templates/gunicorn.erb b/templates/gunicorn.erb
@@ -32,7 +32,7 @@ CONFIG = {
     '--bind=<%= @bind %>',
 <% end -%>
     '--workers=<%= @processorcount.to_i*2 %>',
-    '--timeout=30',
+    '--timeout=<%= @timeout %>',
 <% if @mode != 'django' -%>
     '<%= @appmodule %>',
 <% end -%>
diff --git a/tests/gunicorn.pp b/tests/gunicorn.pp
@@ -13,5 +13,6 @@
   environment => 'prod',
   appmodule   => 'app:app',
   osenv       => { 'DBHOST' => 'dbserver.example.com' },
+  timeout     => 30,
   template    => 'python/gunicorn.erb',
 }

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@`
`13`	`13`	`environment => 'prod',`
`14`	`14`	`appmodule => 'app:app',`
`15`	`15`	`osenv => { 'DBHOST' => 'dbserver.example.com' },`
	`16`	`+ timeout => 30,`
`16`	`17`	`template => 'python/gunicorn.erb',`
`17`	`18`	`}`