From 8607295e0525f8c4a47322e05948437449b4f8c9 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Thu, 6 Feb 2014 16:27:48 +0000 Subject: [PATCH] extract #stop_runnable_resource --- libraries/chef/mixin/pacemaker/runnable_resource.rb | 13 +++++++++++++ providers/primitive.rb | 11 +---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/libraries/chef/mixin/pacemaker/runnable_resource.rb b/libraries/chef/mixin/pacemaker/runnable_resource.rb index 71ebf5b..8297bcf 100644 --- a/libraries/chef/mixin/pacemaker/runnable_resource.rb +++ b/libraries/chef/mixin/pacemaker/runnable_resource.rb @@ -22,6 +22,19 @@ class Chef Chef::Log.info "Successfully started #{@current_cib_object}" end + def stop_runnable_resource + name = new_resource.name + unless @current_resource + raise "Cannot stop non-existent #{cib_object_class.description} '#{name}'" + end + return unless @current_cib_object.running? + execute @current_cib_object.stop_command do + action :nothing + end.run_action(:run) + new_resource.updated_by_last_action(true) + Chef::Log.info "Successfully stopped #{@current_cib_object}" + end + def delete_runnable_resource return unless @current_resource if @current_cib_object.running? diff --git a/providers/primitive.rb b/providers/primitive.rb index aece744..a4a93e8 100644 --- a/providers/primitive.rb +++ b/providers/primitive.rb @@ -48,16 +48,7 @@ action :start do end action :stop do - name = new_resource.name - unless @current_resource - raise "Cannot stop non-existent #{cib_object_class.description} '#{name}'" - end - next unless @current_cib_object.running? - execute @current_cib_object.stop_command do - action :nothing - end.run_action(:run) - new_resource.updated_by_last_action(true) - Chef::Log.info "Successfully stopped #{@current_cib_object}" + stop_runnable_resource end def cib_object_class