Merge branch 'pr/380'

Author: paulczar

.rubocop.yml

@@ -44,4 +44,9 @@ Style/WordArray:
   MinSize: 5
 
 Style/RedundantBegin:
-  Enabled: false
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/NumericLiterals:
+  MinDigits: 6

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 0.11.1
 * MINOR - default logstash version 1.4.2
 * MINOR - correct status code for initv scripts
+* MINOR - parameterize open file limits for upstart method
 
 ## 0.11.0
 * MAJOR - depreciate non runit service types.

attributes/default.rb

@@ -62,6 +62,9 @@
 default['logstash']['instance_default']['runit_run_template_name'] = 'logstash'
 default['logstash']['instance_default']['runit_log_template_name'] = 'logstash'
 
+default['logstash']['instance_default']['limit_nofile_soft']  = 65550
+default['logstash']['instance_default']['limit_nofile_hard']  = 65550
+
 # roles/flags for various autoconfig/discovery components
 default['logstash']['instance_default']['enable_embedded_es'] = false
 default['logstash']['instance_default']['bind_host_interface'] = ''

metadata.rb

@@ -5,6 +5,7 @@
 license          'Apache 2.0'
 description      'Installs/Configures logstash'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+
 version          '0.11.1'
 
 %w(ubuntu debian redhat centos scientific amazon fedora).each do |os|

providers/service.rb

@@ -34,6 +34,8 @@ def load_current_resource
   @supervisor_gid = Logstash.get_attribute_or_default(node, @instance, 'supervisor_gid')
   @runit_run_template_name = Logstash.get_attribute_or_default(node, @instance, 'runit_run_template_name')
   @runit_log_template_name = Logstash.get_attribute_or_default(node, @instance, 'runit_log_template_name')
+  @nofile_soft = Logstash.get_attribute_or_default(node, @instance, 'limit_nofile_soft')
+  @nofile_hard = Logstash.get_attribute_or_default(node, @instance, 'limit_nofile_hard')
 end
 
 action :restart do
@@ -112,7 +114,9 @@ def load_current_resource
                     log_file: svc[:log_file],
                     workers: svc[:workers],
                     supervisor_gid: svc[:supervisor_gid],
-                    upstart_with_sudo: svc[:upstart_with_sudo]
+                    upstart_with_sudo: svc[:upstart_with_sudo],
+                    nofile_soft: svc[:nofile_soft],
+                    nofile_hard: svc[:nofile_hard]
                   )
         notifies :restart, "service[#{svc[:service_name]}]", :delayed
       end
@@ -247,7 +251,9 @@ def svc_vars
     supervisor_gid: @supervisor_gid,
     templates_cookbook: @templates_cookbook,
     runit_run_template_name: @runit_run_template_name,
-    runit_log_template_name: @runit_log_template_name
+    runit_log_template_name: @runit_log_template_name,
+    nofile_soft: @nofile_soft,
+    nofile_hard: @nofile_hard
   }
   svc
 end

templates/default/init/upstart/tarball.erb

@@ -6,7 +6,7 @@ stop on runlevel [!2345]
 
 respawn
 respawn limit 5 30
-limit nofile 65550 65550
+limit nofile <%= @nofile_soft %> <%= @nofile_hard %>
 
 chdir <%= @home %>