Download as
Browse Code »

Commit 72fd27e789e1c0acc1e90b24180a8a7e825e4f63

Authored by Sergio Oliveira
1 parent eaddd0a7
Exists in master and in 54 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Allow to set workers per-environment

Showing 5 changed files with 9 additions and 5 deletions   Show diff stats
config/local/config.yaml
  Diff comments   View file @72fd27e
@@ -17,3 +17,4 @@ relay_ip: 10.10.10.3 @@ -17,3 +17,4 @@ relay_ip: 10.10.10.3
17 alt_ssh_port: 5555 17 alt_ssh_port: 5555
18 from_address: noreply@softwarepublico.dev 18 from_address: noreply@softwarepublico.dev
19 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19 19 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
  20 +colab_http_workers: 1
config/prod/config.yaml
  Diff comments   View file @72fd27e
@@ -23,3 +23,4 @@ external_outgoing_mail_domain: serpro.gov.br @@ -23,3 +23,4 @@ external_outgoing_mail_domain: serpro.gov.br
23 raven_dsn: https://4418146896924efe9b73d557f803f047:8a59f39b5f584ff589ecf3dd47faaead@sentry.tracy.com.br/13 23 raven_dsn: https://4418146896924efe9b73d557f803f047:8a59f39b5f584ff589ecf3dd47faaead@sentry.tracy.com.br/13
24 google_analytics_id: 'UA-64206731-1' 24 google_analytics_id: 'UA-64206731-1'
25 munin_master: 10.21.0.10 25 munin_master: 10.21.0.10
  26 +colab_http_workers: 32
cookbooks/colab/recipes/default.rb
  Diff comments   View file @72fd27e
@@ -46,10 +46,7 @@ execute 'secret-key' do @@ -46,10 +46,7 @@ execute 'secret-key' do
46 notifies :create, 'template[/etc/colab/settings.d/00-custom_settings.py]' 46 notifies :create, 'template[/etc/colab/settings.d/00-custom_settings.py]'
47 end 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 notifies :restart, 'service[colab]' 50 notifies :restart, 'service[colab]'
54 end 51 end
55 52
cookbooks/colab/templates/colab.erb
View file @eaddd0a
@@ -1 +0,0 @@ @@ -1 +0,0 @@
1 -WEB_CONCURRENCY=<%= `nproc`.to_i * 4 %>  
cookbooks/colab/templates/gunicorn.py.erb 0 → 100644
  Diff comments   View file @72fd27e
@@ -0,0 +1,6 @@ @@ -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"