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

Fix command_timeout_error_message calls #165

Closed
wants to merge 1 commit into from
+5 −5
Closed

Fix command_timeout_error_message calls #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def wait_until_ready!

# the Error message to display if a command times out. Subclasses
# may want to override this to provide more details on the timeout.
def command_timeout_error_message
def command_timeout_error_message(cmd)
<<-EOM

Command timed out:
Expand All @@ -233,7 +233,7 @@ def execute_cmd(cmd, timeout = new_resource.cmd_timeout)
begin
shell_out(cmd, :timeout => timeout)
rescue Mixlib::ShellOut::CommandTimeout
raise CommandTimeout, command_timeout_error_message
raise CommandTimeout, command_timeout_error_message(cmd)
end
end

Expand Down
2 changes: 1 addition & 1 deletion providers/container.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def docker_containers
end
end

def command_timeout_error_message
def command_timeout_error_message(cmd)
<<-EOM

Command timed out:
Expand Down
2 changes: 1 addition & 1 deletion providers/image.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def di(di_line)
image
end

def command_timeout_error_message
def command_timeout_error_message(cmd)
<<-EOM

Command timed out:
Expand Down
2 changes: 1 addition & 1 deletion providers/registry.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def load_current_resource
end
end

def command_timeout_error_message
def command_timeout_error_message(cmd)
<<-EOM

Command timed out:
Expand Down