Merge pull request #1253 from adamesque/patch-1

Don't hang on to the first Logger instance you see
This commit is contained in:
Thomas Reynolds 2014-04-07 16:44:12 -07:00
commit 6a34bf544a

View file

@ -149,7 +149,9 @@ module Middleman
include Middleman::CoreExtensions::ExternalHelpers include Middleman::CoreExtensions::ExternalHelpers
# Reference to Logger singleton # Reference to Logger singleton
attr_reader :logger def logger
::Middleman::Logger.singleton
end
# New container for config.rb commands # New container for config.rb commands
attr_reader :config_context attr_reader :config_context
@ -167,7 +169,6 @@ module Middleman
# Initialize the Middleman project # Initialize the Middleman project
def initialize(&block) def initialize(&block)
@logger = ::Middleman::Logger.singleton
@template_context_class = Class.new(Middleman::TemplateContext) @template_context_class = Class.new(Middleman::TemplateContext)
@generic_template_context = @template_context_class.new(self) @generic_template_context = @template_context_class.new(self)
@config_context = ConfigContext.new(self, @template_context_class) @config_context = ConfigContext.new(self, @template_context_class)