Skip to content

Commit

Permalink
little less verbose logging and some comments cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
tcurdt committed Apr 20, 2014
1 parent e31c15b commit d306f81
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 0 additions & 2 deletions lib/awestruct/handler_chains.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ class HandlerChains
Awestruct::Handlers::RedirectHandler::CHAIN,
Awestruct::Handlers::RestructuredtextHandler::CHAIN,
Awestruct::Handlers::JavascriptHandler::CHAIN,
# TC: shouldn't the asciidoctor be covered by the tilt handler?
# JP: We have some additional asciidoctor integration that the tilt handler doesn't handle (yet, working on it)
Awestruct::Handlers::AsciidoctorHandler::CHAIN,
Awestruct::Handlers::TiltHandler::NON_INTERPOLATION_CHAIN,
Awestruct::Handlers::TiltHandler::INTERPOLATION_CHAIN,
Expand Down
8 changes: 4 additions & 4 deletions lib/awestruct/handlers/base_tilt_handler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ class TiltMatcher
def match(path)
matcher = ::Tilt[File.basename(path)]
if matcher.nil?
$LOG.warn(%(Copying #{path} to generated site without processing; could not load engine for type))
$LOG.warn(%(Copying #{path}))
return false
end

# We have our own extra integration with Asciidoctor
if matcher.name.include? 'Asciidoctor'
return false
Expand Down Expand Up @@ -141,9 +141,9 @@ def rendered_content(context, with_layouts=true)
rescue Exception => e
error_page = context[:page]
if error_page[:__is_layout] == true
ExceptionHelper.log_message "An error during rendering layout file #{File.join site.dir, error_page.source_path} occurred."
ExceptionHelper.log_message "An error during rendering layout file #{File.join site.dir, error_page.source_path} occurred."
else
ExceptionHelper.log_message "An error during rendering #{File.join site.dir, error_page.source_path} occurred."
ExceptionHelper.log_message "An error during rendering #{File.join site.dir, error_page.source_path} occurred."
end
ExceptionHelper.log_message "Please see #{File.join site.dir, error_page.output_path} for more information"
return ExceptionHelper.html_error_report e, error_page.source_path
Expand Down

0 comments on commit d306f81

Please sign in to comment.