Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved windows_task logging #6617

Merged
merged 4 commits into from Dec 6, 2017
Merged

Improved windows_task logging #6617

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a84ad1
Fix typos that prevented logging
tas50 Dec 6, 2017
2b32e2e
Add debug logging for the task existing
tas50 Dec 6, 2017
d61a3ee
Clarify why we're not doing anything here
tas50 Dec 6, 2017
36da7ad
Use converge_by to perform actual resource updates
tas50 Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 29 additions & 23 deletions lib/chef/provider/windows_task.rb
View file
Open in desktop
Expand Up @@ -75,8 +75,9 @@ def resource_attributes

def action_create
if current_resource.exists
Chef::Log.debug "#{new_resource} task exists."
if !(task_need_update? || new_resource.force)
Chef::Log.info "#{new_resource} task already exists - nothing to do"
Chef::Log.info "#{new_resource} task doesn't need updating and force not specified - nothing to do"
return
end
# Setting the attributes of new_resource as current_resource.
Expand Down Expand Up @@ -121,20 +122,21 @@ def action_create
xml_options << "cwd" if new_resource.cwd
xml_options << "random_delay" if new_resource.random_delay
xml_options << "execution_time_limit" if new_resource.execution_time_limit
update_task_xml(xml_options) unless xml_options.empty?

new_resource.updated_by_last_action true
Chef::Log.info "#{new_resource} task created"
converge_by("#{new_resource} task created") do
update_task_xml(xml_options) unless xml_options.empty?
end
end

def action_run
if current_resource.exists
Chef::Log.debug "#{new_resource} task exists."
if current_resource.status == :running
Chef::Log.info "#{new_resource} task is currently running, skipping run"
Chef::Log.info "#{new_resource} task is currently running, skipping run."
else
run_schtasks "RUN"
new_resource.updated_by_last_action true
Chef::Log.info "#{new_resource} task ran"
converge_by("run scheduled task #{new_resource}") do
run_schtasks "RUN"
end
end
else
Chef::Log.warn "#{new_resource} task doesn't exists - nothing to do"
Expand All @@ -143,23 +145,25 @@ def action_run

def action_delete
if current_resource.exists
# always need to force deletion
run_schtasks "DELETE", "F" => ""
new_resource.updated_by_last_action true
Chef::Log.info "#{new_resource} task deleted"
Chef::Log.debug "#{new_resource} task exists."
converge_by("delete scheduled task #{new_resource}") do
# always need to force deletion
run_schtasks "DELETE", "F" => ""
end
else
Chef::Log.warn "#{new_resource} task doesn't exists - nothing to do"
end
end

def action_end
if current_resource.exists
Chef::Log.debug "#{new_resource} task exists."
if current_resource.status != :running
Chef::Log.debug "#{new_resource} is not running - nothing to do"
else
run_schtasks "END"
new_resource.updated_by_last_action true
Chef::Log.info "#{new_resource} task ended"
converge_by("#{new_resource} task ended") do
run_schtasks "END"
end
end
else
Chef::Log.warn "#{new_resource} task doesn't exist - nothing to do"
Expand All @@ -168,12 +172,13 @@ def action_end

def action_enable
if current_resource.exists
Chef::Log.debug "#{new_resource} task exists."
if current_resource.enabled
Chef::Log.debug "#{new_resource} already enabled - nothing to do"
else
run_schtasks "CHANGE", "ENABLE" => ""
new_resource.updated_by_last_action true
Chef::Log.info "#{new_resource} task enabled"
converge_by("#{new_resource} task enabled") do
run_schtasks "CHANGE", "ENABLE" => ""
end
end
else
Chef::Log.fatal "#{new_resource} task doesn't exist - nothing to do"
Expand All @@ -183,10 +188,11 @@ def action_enable

def action_disable
if current_resource.exists
Chef::Log.info "#{new_resource} task exists."
if current_resource.enabled
run_schtasks "CHANGE", "DISABLE" => ""
new_resource.updated_by_last_action true
Chef::Log.info "#{new_resource} task disabled"
converge_by("#{new_resource} task disabled") do
run_schtasks "CHANGE", "DISABLE" => ""
end
else
Chef::Log.warn "#{new_resource} already disabled - nothing to do"
end
Expand Down Expand Up @@ -328,12 +334,12 @@ def update_task_xml(options = [])
end

options.each do |option|
Chef::Log.debug 'Removing former #{option} if any'
Chef::Log.debug "Removing former #{option} if any"
doc.root.elements.delete(xml_element_mapping[option])
option_value = new_resource.send("#{option}")

if option_value
Chef::Log.debug "Setting #option as #option_value"
Chef::Log.debug "Setting #{option} as #{option_value}"
split_xml_path = xml_element_mapping[option].split("/") # eg. if xml_element_mapping[option] = "Actions/Exec/WorkingDirectory"
element_name = split_xml_path.last # element_name = "WorkingDirectory"
cwd_element = REXML::Element.new(element_name)
Expand Down