From 81ff5ed7aa4e92b9170ad805ef6ba1c192e3ac70 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 8 May 2014 22:22:11 -0400 Subject: [PATCH 1/2] Save --watch from errors. Fixes #2355. --- lib/jekyll/commands/build.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb index 1c942a0b..85f4139d 100644 --- a/lib/jekyll/commands/build.rb +++ b/lib/jekyll/commands/build.rb @@ -67,8 +67,6 @@ module Jekyll ignored = nil end - Jekyll.logger.info "Auto-regeneration:", "enabled" - listener = Listen.to( source, :ignore => ignored, @@ -77,11 +75,19 @@ module Jekyll t = Time.now.strftime("%Y-%m-%d %H:%M:%S") n = modified.length + added.length + removed.length print Jekyll.logger.formatted_topic("Regenerating:") + "#{n} files at #{t} " - process_site(site) - puts "...done." + begin + process_site(site) + puts "...done." + rescue => e + puts "...error:" + puts e.message + puts "Run jekyll build --trace for more information." + end end listener.start + Jekyll.logger.info "Auto-regeneration:", "enabled" + unless options['serving'] trap("INT") do listener.stop From 2d040c1aaafcec2eadf4a825e9cf741b25a25523 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 8 May 2014 22:27:55 -0400 Subject: [PATCH 2/2] Use Jekyll.logger for --watch error message. --- lib/jekyll/commands/build.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb index 85f4139d..54c774ab 100644 --- a/lib/jekyll/commands/build.rb +++ b/lib/jekyll/commands/build.rb @@ -80,8 +80,8 @@ module Jekyll puts "...done." rescue => e puts "...error:" - puts e.message - puts "Run jekyll build --trace for more information." + Jekyll.logger.warn "Error:", e.message + Jekyll.logger.warn "Error:", "Run jekyll build --trace for more information." end end listener.start