diff --git a/pelican/__init__.py b/pelican/__init__.py index d42526a3..77db7498 100644 --- a/pelican/__init__.py +++ b/pelican/__init__.py @@ -258,7 +258,13 @@ def main(): time.sleep(.5) # sleep to avoid cpu load except KeyboardInterrupt: + logger.warning("Keyboard interrupt, quitting.") break + except Exception, e: + logger.warning( + "Caught exception \"{}\". Reloading.".format(e) + ) + continue else: pelican.run() except Exception, e: diff --git a/pelican/generators.py b/pelican/generators.py index faa6d193..20369c71 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -372,7 +372,7 @@ class PagesGenerator(Generator): try: content, metadata = read_file(f) except Exception, e: - logger.error(u'Could not process %s\n%s' % (f, str(e))) + logger.warning(u'Could not process %s\n%s' % (f, str(e))) continue page = Page(content, metadata, settings=self.settings, filename=f)