dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be quiet very quickly. Fixes #2520.

This commit is contained in:
Parker Moore 2014-06-28 17:19:40 -04:00
parent 8b36b71833
commit e332197660
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/jekyll/configuration.rb
View File

@ -40,6 +40,7 @@ module Jekyll
'markdown_ext' => 'markdown,mkdown,mkdn,mkd,md', 'markdown_ext' => 'markdown,mkdown,mkdn,mkd,md',
'textile_ext' => 'textile', 'textile_ext' => 'textile',
'quiet' => false,
'port' => '4000', 'port' => '4000',
'host' => '0.0.0.0', 'host' => '0.0.0.0',
@ -103,6 +104,10 @@ module Jekyll
override['source'] || self['source'] || DEFAULTS['source'] override['source'] || self['source'] || DEFAULTS['source']
end end
def quiet?(override = {})
override['quiet'] || self['quiet'] || DEFAULTS['quiet']
end
def safe_load_file(filename) def safe_load_file(filename)
case File.extname(filename) case File.extname(filename)
when '.toml' when '.toml'
@ -120,6 +125,9 @@ module Jekyll
# #
# Returns an Array of config files # Returns an Array of config files
def config_files(override) def config_files(override)
# Be quiet quickly.
Jekyll.logger.log_level = :error if quiet?(override)
# Get configuration from <source>/_config.yml or <source>/<config_file> # Get configuration from <source>/_config.yml or <source>/<config_file>
config_files = override.delete('config') config_files = override.delete('config')
if config_files.to_s.empty? if config_files.to_s.empty?