Skip to content
This repository was archived by the owner on Dec 27, 2022. It is now read-only.

Commit 48246ce

Browse files
committed
Merge branch 'development' into 0.11.0_RC1
Conflicts: providers/service.rb
2 parents eaf746c + e3ad596 commit 48246ce

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

providers/service.rb

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ def load_current_resource
3737
end
3838

3939
action :restart do
40-
service_action(:restart)
40+
new_resource.updated_by_last_action(service_action(:restart))
4141
end
4242

4343
action :start do
44-
service_action(:start)
44+
new_resource.updated_by_last_action(service_action(:start))
4545
end
4646

4747
action :stop do
48-
service_action(:stop)
48+
new_resource.updated_by_last_action(service_action(:stop))
4949
end
5050

5151
action :reload do
52-
service_action(:reload)
52+
new_resource.updated_by_last_action(service_action(:reload))
5353
end
5454

5555
action :enable do
@@ -217,14 +217,12 @@ def service_action(action)
217217
else
218218
sv.provider(Chef::Provider::Service::Init)
219219
end
220-
sv.run_action(action)
221-
new_resource.updated_by_last_action(sv.updated_by_last_action?)
222220
when 'runit'
223221
@run_context.include_recipe 'runit::default'
224222
sv = runit_service svc[:service_name]
225-
sv.run_action(action)
226-
new_resource.updated_by_last_action(sv.updated_by_last_action?)
227223
end
224+
sv.run_action(action)
225+
sv.updated_by_last_action?
228226
end
229227

230228
def svc_vars

0 commit comments

Comments
 (0)