Allow to set workers per-environment

Sergio Oliveira
1 parent eaddd0a7
Showing 5 changed files with 9 additions and 5 deletions Show diff stats
config/local/config.yaml
config/prod/config.yaml
cookbooks/colab/recipes/default.rb
cookbooks/colab/templates/colab.erb
cookbooks/colab/templates/gunicorn.py.erb
@@ -17,3 +17,4 @@ relay_ip: 10.10.10.3
 alt_ssh_port: 5555
 from_address: noreply@softwarepublico.dev
 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
+colab_http_workers: 1
@@ -23,3 +23,4 @@ external_outgoing_mail_domain: serpro.gov.br
 raven_dsn: https://4418146896924efe9b73d557f803f047:8a59f39b5f584ff589ecf3dd47faaead@sentry.tracy.com.br/13
 google_analytics_id: 'UA-64206731-1'
 munin_master: 10.21.0.10
+colab_http_workers: 32
@@ -46,10 +46,7 @@ execute &#39;secret-key&#39; do
   notifies :create, 'template[/etc/colab/settings.d/00-custom_settings.py]'
 end
  
-template '/etc/sysconfig/colab' do
-  owner 'root'
-  group 'root'
-  mode '0640'
+template '/etc/colab/gunicorn.py' do
   notifies :restart, 'service[colab]'
 end
  
@@ -1 +0,0 @@
-WEB_CONCURRENCY=<%= `nproc`.to_i * 4 %>
@@ -0,0 +1,6 @@
+import multiprocessing
+
+bind = "127.0.0.1:8001"
+workers = <%= node['config']['colab_http_workers'] || 'multiprocessing.cpu_count() * 2 + 1' %>
+syslog = True
+proc_name = "colab"
...	...	@@ -17,3 +17,4 @@ relay_ip: 10.10.10.3
17	17	alt_ssh_port: 5555
18	18	from_address: noreply@softwarepublico.dev
19	19	raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
	20	+colab_http_workers: 1
...	...
...	...	@@ -23,3 +23,4 @@ external_outgoing_mail_domain: serpro.gov.br
23	23	raven_dsn: https://4418146896924efe9b73d557f803f047:8a59f39b5f584ff589ecf3dd47faaead@sentry.tracy.com.br/13
24	24	google_analytics_id: 'UA-64206731-1'
25	25	munin_master: 10.21.0.10
	26	+colab_http_workers: 32
...	...
...	...	@@ -46,10 +46,7 @@ execute 'secret-key' do
46	46	notifies :create, 'template[/etc/colab/settings.d/00-custom_settings.py]'
47	47	end
48	48
49		-template '/etc/sysconfig/colab' do
50		- owner 'root'
51		- group 'root'
52		- mode '0640'
	49	+template '/etc/colab/gunicorn.py' do
53	50	notifies :restart, 'service[colab]'
54	51	end
55	52
...	...
...	...	@@ -1 +0,0 @@
1		-WEB_CONCURRENCY=<%= `nproc`.to_i * 4 %>
...	...	@@ -0,0 +1,6 @@
	1	+import multiprocessing
	2	+
	3	+bind = "127.0.0.1:8001"
	4	+workers = <%= node['config']['colab_http_workers'] \|\| 'multiprocessing.cpu_count() * 2 + 1' %>
	5	+syslog = True
	6	+proc_name = "colab"
...	...