Skip to content

Commit

Permalink
Fixes #26758 - unify renderer_error helper
Browse files Browse the repository at this point in the history
  • Loading branch information
lzap committed May 7, 2019
1 parent 3348b39 commit b908ea8
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions app/controllers/unattended_controller.rb
Expand Up @@ -80,14 +80,6 @@ def preview?
params.key?(:spoof) || params.key?(:hostname)
end

def render_error(status, error_message, params)
logger.error error_message % params
message = _(error_message) % params
return render_ipxe_message(message: message, status: status) if ipxe_request?
# add a comment character (works with Red Hat and Debian systems) to avoid parsing errors
render(:plain => "# #{message}", :status => status, :content_type => 'text/plain')
end

def render_intermediate_template
ipxe_template_kind = TemplateKind.find_by(name: 'iPXE')
name = Setting[:intermediate_ipxe_script]
Expand Down Expand Up @@ -171,7 +163,15 @@ def verify_found_host
end

error = host_verifier.errors.first
render_error(error[:type], error[:message], error[:params])
if ipxe_request?
render_ipxe_message(error[:message])
else
render_error(
:message => error[:message],
:error => error[:type],
:status => :internal_server_error
)
end

false
end
Expand Down

0 comments on commit b908ea8

Please sign in to comment.