No more alias_method_chain
Andrew Kane
committed Feb 21, 2016
commit d7b72edb877e5ef7d4c1b5dcfbd8ac4cc0c36468
Showing 2
changed files with
9 additions
and 13 deletions
ahoy.rb b/lib/ahoy.rb
+2
-2
| @@ | @@ -94,10 +94,10 @@ begin |
| require "active_record/session_store/extension/logger_silencer" | |
| rescue LoadError | |
| require "ahoy/logger_silencer" | |
| - | Logger.send :include, Ahoy::LoggerSilencer |
| + | Logger.send(:prepend, Ahoy::LoggerSilencer) |
| begin | |
| require "syslog/logger" | |
| - | Syslog::Logger.send :include, Ahoy::LoggerSilencer |
| + | Syslog::Logger.send(:prepend, Ahoy::LoggerSilencer) |
| rescue LoadError; end | |
| end | |
ahoy/logger_silencer.rb b/lib/ahoy/logger_silencer.rb
+7
-11
| @@ | @@ -7,13 +7,9 @@ require "active_support/concern" |
| module Ahoy | |
| module LoggerSilencer | |
| - | extend ActiveSupport::Concern |
| - | |
| - | included do |
| - | cattr_accessor :silencer |
| - | self.silencer = true |
| - | alias_method_chain :level, :threadsafety |
| - | alias_method_chain :add, :threadsafety |
| + | def self.prepended(base) |
| + | base.cattr_accessor :silencer |
| + | base.silencer = true |
| end | |
| def thread_level | |
| @@ | @@ -24,15 +20,15 @@ module Ahoy |
| Thread.current[thread_hash_level_key] = level | |
| end | |
| - | def level_with_threadsafety |
| - | thread_level || level_without_threadsafety |
| + | def level |
| + | thread_level || super |
| end | |
| - | def add_with_threadsafety(severity, message = nil, progname = nil, &block) |
| + | def add(severity, message = nil, progname = nil, &block) |
| if !defined?(@logdev) || @logdev.nil? || (severity || UNKNOWN) < level | |
| true | |
| else | |
| - | add_without_threadsafety(severity, message, progname, &block) |
| + | super |
| end | |
| end | |