Don't need custom log silencer in newer versions of Rails - closes #142

Andrew committed Feb 23, 2018

commit 28d1842bf6a56d3a6cc1607807dba19cbc75b3f3

Showing 1 changed file with 13 additions and 11 deletions

ahoy.rb b/lib/ahoy.rb +13 -11

@@	@@ -128,17 +128,19 @@ if defined?(Rails)
	extend Ahoy::Model
	end

-	# ensure logger silence will not be added by activerecord-session_store
-	# otherwise, we get SystemStackError: stack level too deep
-	begin
-	require "active_record/session_store/extension/logger_silencer"
-	rescue LoadError
-	require "ahoy/logger_silencer"
-	Logger.send :include, Ahoy::LoggerSilencer
-
+	if Rails.version < "4.2"
+	# ensure logger silence will not be added by activerecord-session_store
+	# otherwise, we get SystemStackError: stack level too deep
	begin
-	require "syslog/logger"
-	Syslog::Logger.send :include, Ahoy::LoggerSilencer
-	rescue LoadError; end
+	require "active_record/session_store/extension/logger_silencer"
+	rescue LoadError
+	require "ahoy/logger_silencer"
+	Logger.send :include, Ahoy::LoggerSilencer
+
+	begin
+	require "syslog/logger"
+	Syslog::Logger.send :include, Ahoy::LoggerSilencer
+	rescue LoadError; end
+	end
	end
	end