Fix #432

fix init upstart
determinate ubuntu 16.04 nativ init
fix systemd init
fix systemd java options

Author: cyberflow

libraries/logstash_util.rb

@@ -37,8 +37,10 @@ def self.determine_native_init(node)
     platform_major_version = determine_platform_major_version(node)
     case node['platform']
     when 'ubuntu'
-      if platform_major_version >= 6.10
+      if platform_major_version >= 6.10 && platform_major_version < 16
         'upstart'
+      elsif platform_major_version >= 16.04
+        'systemd'
       else
         'sysvinit'
       end

templates/default/init/systemd/tarball.erb

@@ -6,12 +6,12 @@ After=network.target
 User=<%= @user %>
 Group=<%= @supervisor_gid %>
 WorkingDirectory=<%= @home %>
-LimitNOFILE=<%= @nofile_soft %> <%= @nofile_hard %>
+LimitNOFILE=<%= @nofile_soft %>
 Environment="LOGSTASH_HOME=<%= @home %>"
 Environment="HOME=<%= @home %>"
 Environment="LS_HEAP_SIZE=<%= @max_heap %>"
 Environment="GC_OPTS=<%= @gc_opts %>"
-Environment='JAVA_OPTS=-server -Xms<%= @min_heap %> -Xmx<%= @max_heap %> -Djava.io.tmpdir=<%= @home %>/tmp/ <%= @java_opts %> <%= "-Djava.net.preferIPv4Stack=true" if @ipv4_only %>'
+Environment='LS_JAVA_OPTS=-server -Xms<%= @min_heap %> -Xmx<%= @max_heap %> -Djava.io.tmpdir=<%= @home %>/tmp/ <%= @java_opts %> <%= "-Djava.net.preferIPv4Stack=true" if @ipv4_only %>'
 ExecStart=<%= "#{@home}/bin/logstash #{@args.join(' ')}" %>
 Restart=on-failure
 RestartSec=30

templates/default/init/sysvinit/tarball.erb

@@ -16,7 +16,7 @@ LS_USER="<%= @user %>"
 LS_GROUP="<%= @group %>"
 LS_LOG="<%= @log_file %>"
 LOGDIR="<%= ::File.dirname @log_file %>"
-export JAVA_OPTS="-server -Xms<%= @min_heap %> -Xmx<%= @max_heap %> -Djava.io.tmpdir=$LS_HOME/tmp/ <%= @java_opts %> <%= '-Djava.net.preferIPv4Stack=true' if @ipv4_only %>"
+export LS_JAVA_OPTS="-server -Xms<%= @min_heap %> -Xmx<%= @max_heap %> -Djava.io.tmpdir=$LS_HOME/tmp/ <%= @java_opts %> <%= '-Djava.net.preferIPv4Stack=true' if @ipv4_only %>"
 BIN_SCRIPT="/usr/bin/env $LS_HOME/bin/logstash $LOGSTASH_OPTS > $LS_LOG 2>&1 &  echo \$! > $PIDFILE"
 
 if [ -f /etc/init.d/functions ] ; then

templates/default/init/upstart/tarball.erb

@@ -23,7 +23,7 @@ script
   export HOME=$LOGSTASH_HOME
   export LOGSTASH_OPTS="<%= @args.join(' ') %>"
   export GC_OPTS="<%= @gc_opts %>"
-  export JAVA_OPTS="-server -Xms<%= @min_heap %> -Xmx<%= @max_heap %> -Djava.io.tmpdir=$LOGSTASH_HOME/tmp/ <%= @java_opts %> <%= '-Djava.net.preferIPv4Stack=true' if @ipv4_only %>"
+  export LS_JAVA_OPTS="-server -Xms<%= @min_heap %> -Xmx<%= @max_heap %> -Djava.io.tmpdir=$LOGSTASH_HOME/tmp/ <%= @java_opts %> <%= '-Djava.net.preferIPv4Stack=true' if @ipv4_only %>"
   <% if @user_supported -%>
   exec $LOGSTASH_HOME/bin/logstash $LOGSTASH_OPTS
   <% else -%>

templates/default/sv-logstash-run.erb

@@ -11,7 +11,7 @@ export LOGSTASH_HOME="<%= @options[:home] %>"
 # Must set HEAP_DUMP_PATH if vendored jruby is to work
 export HEAP_DUMP_PATH="-XX:HeapDumpPath=<%= @options[:home] %>/heapdump.hprof"
 export GC_OPTS="<%= @options[:gc_opts] %>"
-export JAVA_OPTS="-server -Xms<%= @options[:min_heap] %> -Xmx<%= @options[:max_heap] %> -Djava.io.tmpdir=$LOGSTASH_HOME/tmp/ <%= @options[:java_opts] %> <%= '-Djava.net.preferIPv4Stack=true' if @options[:ipv4_only] %>"
+export LS_JAVA_OPTS="-server -Xms<%= @options[:min_heap] %> -Xmx<%= @options[:max_heap] %> -Djava.io.tmpdir=$LOGSTASH_HOME/tmp/ <%= @options[:java_opts] %> <%= '-Djava.net.preferIPv4Stack=true' if @options[:ipv4_only] %>"
 LOGSTASH_OPTS="agent -f $LOGSTASH_HOME/etc/conf.d"
 <% if @options[:pluginpath] -%>
 LOGSTASH_OPTS="$LOGSTASH_OPTS --pluginpath $LOGSTASH_HOME/lib"