From d306f81e63e2388e7a8a895f6fa0489a2f3f659a Mon Sep 17 00:00:00 2001 From: Torsten Curdt Date: Sun, 20 Apr 2014 14:48:57 +0200 Subject: [PATCH] little less verbose logging and some comments cleanup --- lib/awestruct/handler_chains.rb | 2 -- lib/awestruct/handlers/base_tilt_handler.rb | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/awestruct/handler_chains.rb b/lib/awestruct/handler_chains.rb index c67f3b77..54221655 100644 --- a/lib/awestruct/handler_chains.rb +++ b/lib/awestruct/handler_chains.rb @@ -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, diff --git a/lib/awestruct/handlers/base_tilt_handler.rb b/lib/awestruct/handlers/base_tilt_handler.rb index f0b6a6c0..1424cbca 100644 --- a/lib/awestruct/handlers/base_tilt_handler.rb +++ b/lib/awestruct/handlers/base_tilt_handler.rb @@ -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 @@ -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