Merge "Revert "Raise number of nailgun uWSGI workers and sockets""

deployment/puppet/nailgun/manifests/host.pp

@@ -81,6 +81,4 @@ $gem_source = 'http://localhost/gems/',
   sysctl::value{'net.ipv4.neigh.default.gc_thresh2': value => '1024'}
   sysctl::value{'net.ipv4.neigh.default.gc_thresh3': value => '2048'}
 
-  #Increase max connections for sockets for Nailgun uWSGI
-  sysctl::value{'net.core.somaxconn': value => '4096'}
 }

deployment/puppet/nailgun/manifests/uwsgi.pp

@@ -7,10 +7,10 @@
 class nailgun::uwsgi(
 ) {
 
-  if $::physicalprocessorcount > 4  {
+  if $::physicalprocessorcount > 8  {
     $physicalprocessorcount = 8
   } else {
-    $physicalprocessorcount = $::physicalprocessorcount * 2
+    $physicalprocessorcount = $::physicalprocessorcount
   }
 
   package { ['uwsgi', 'uwsgi-plugin-common', 'uwsgi-plugin-python']:

deployment/puppet/nailgun/templates/uwsgi_nailgun.yaml.erb

@@ -11,6 +11,5 @@ uwsgi:
   virtualenv: <%= @venv %>
   module: nailgun.wsgi
   buffer-size: 49180
-  listen: 4096
   pidfile: /tmp/nailgun.pid
   logto: /var/log/nailgun/app.log