From bfe1b77c8749ab717589b7739ffda345fd49d0a3 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 20 Jul 2015 03:05:32 +0200
Subject: [PATCH] use rails logger

and ignore logging for test coverage
---
 lib/diaspora_federation/logging.rb | 6 ++++--
 spec/spec_helper.rb                | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/diaspora_federation/logging.rb b/lib/diaspora_federation/logging.rb
index 125415c..615e0e2 100644
--- a/lib/diaspora_federation/logging.rb
+++ b/lib/diaspora_federation/logging.rb
@@ -13,10 +13,12 @@ module DiasporaFederation
                     # use logging-gem if available
                     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
                     @logger = Logger.new(STDOUT)
-                    loglevel = defined?(::Rails) ? ::Rails.configuration.log_level.to_s.upcase : "INFO"
-                    @logger.level = Logger.const_get(loglevel)
+                    @logger.level = Logger::INFO
                     @logger
                   end
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1d588a1..be9589d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,6 +6,7 @@ unless ENV["NO_COVERAGE"] == "true"
     SimpleCov::Formatter::RcovFormatter
   ]
   SimpleCov.start do
+    add_filter "lib/diaspora_federation/logging.rb"
     add_filter "spec"
     add_filter "test"
   end