fixes for service_restart

for issue #330

.gitignore

@@ -5,4 +5,5 @@ vendor/
 .kitchen/
 .kitchen.local.yml
 .bundle/
-bin/
+bin/
+Gemfile.lock

providers/config.rb

@@ -29,6 +29,8 @@ def load_current_resource
   @service_name = new_resource.service_name || @instance
 end
 
+use_inline_resources
+
 action :create do
   conf = conf_vars
   # Chef::Log.info("config vars: #{conf.inspect}")
@@ -40,7 +42,6 @@ def load_current_resource
       group       conf[:group]
       mode        conf[:mode]
       variables   conf[:variables]
-      notifies    :restart, "logstash_service[#{conf[:service_name]}]"
       action      :create
     end
     new_resource.updated_by_last_action(tp.updated_by_last_action?)

providers/service.rb

@@ -41,52 +41,22 @@ def load_current_resource
   @supervisor_gid = attributes['supervisor_gid'] || defaults['supervisor_gid']
 end
 
+use_inline_resources
+
 action :restart do
-  svc = svc_vars
-  case svc[:method]
-  when 'native'
-    sv = service svc[:service_name] do
-      # provider Chef::Provider::Service::Upstart
-      action [:restart]
-    end
-    new_resource.updated_by_last_action(sv.updated_by_last_action?)
-  end
+  service_action(:restart)
 end
 
 action :start do
-  svc = svc_vars
-  case svc[:method]
-  when 'native'
-    sv = service svc[:service_name] do
-      # provider Chef::Provider::Service::Upstart
-      action [:start]
-    end
-    new_resource.updated_by_last_action(sv.updated_by_last_action?)
-  end
+  service_action(:start)
 end
 
 action :stop do
-  svc = svc_vars
-  case svc[:method]
-  when 'native'
-    sv = service svc[:service_name] do
-      # provider Chef::Provider::Service::Upstart
-      action [:stop]
-    end
-    new_resource.updated_by_last_action(sv.updated_by_last_action?)
-  end
+  service_action(:stop)
 end
 
 action :reload do
-  svc = svc_vars
-  case svc[:method]
-  when 'native'
-    sv = service svc[:service_name] do
-      # provider Chef::Provider::Service::Upstart
-      action [:reload]
-    end
-    new_resource.updated_by_last_action(sv.updated_by_last_action?)
-  end
+  service_action(:reload)
 end
 
 action :enable do
@@ -243,6 +213,42 @@ def default_args
   args
 end
 
+def service_action(action)
+  svc = svc_vars
+  case svc[:method]
+  when 'native'
+    sv = service svc[:service_name]
+    case pick_provider
+    when 'systemd'
+      sv.provider(Chef::Provider::Service::Systemd)
+    when 'upstart'
+      sv.provider(Chef::Provider::Service::Upstart)
+    else
+      sv.provider(Chef::Provider::Service::Init)
+    end
+    sv.run_action(action)
+    new_resource.updated_by_last_action(sv.updated_by_last_action?)
+  end
+end
+
+def pick_provider
+  if platform_family? 'fedora'
+    if  node['platform_version'] >= '15'
+      return 'systemd'
+    else
+      return 'default'
+    end
+  elsif platform_family? 'debian'
+    if node['platform_version'] >= '12.04'
+      return 'upstart'
+    else
+      return 'default'
+    end
+  else
+    return 'default'
+  end
+end
+
 def svc_vars
   svc = {
     name: @instance,

recipes/agent.rb

@@ -24,6 +24,7 @@
     input_file_name: '/var/log/syslog',
     input_file_type: 'syslog'
   )
+  notifies :restart, "logstash_service[#{name}]"
   action [:create]
 end