use rails logger

and ignore logging for test coverage
This commit is contained in:
Benjamin Neff 2015-07-20 03:05:32 +02:00
parent 5be60f8fe0
commit bfe1b77c87
2 changed files with 5 additions and 2 deletions

View file

@ -13,10 +13,12 @@ module DiasporaFederation
# use logging-gem if available # use logging-gem if available
return ::Logging::Logger[self] if defined?(::Logging::Logger) return ::Logging::Logger[self] if defined?(::Logging::Logger)
# use rails logger if running in rails and no logging-gem is available
return ::Rails.logger if defined?(::Rails)
# fallback logger # fallback logger
@logger = Logger.new(STDOUT) @logger = Logger.new(STDOUT)
loglevel = defined?(::Rails) ? ::Rails.configuration.log_level.to_s.upcase : "INFO" @logger.level = Logger::INFO
@logger.level = Logger.const_get(loglevel)
@logger @logger
end end
end end

View file

@ -6,6 +6,7 @@ unless ENV["NO_COVERAGE"] == "true"
SimpleCov::Formatter::RcovFormatter SimpleCov::Formatter::RcovFormatter
] ]
SimpleCov.start do SimpleCov.start do
add_filter "lib/diaspora_federation/logging.rb"
add_filter "spec" add_filter "spec"
add_filter "test" add_filter "test"
end end