Tag all logged messages through Makara's logger with [Makara]

instacart · Mar 20, 2018 · 5b1f0a7 · 5b1f0a7
1 parent c8029b0
commit 5b1f0a7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/makara/cache.rb b/lib/makara/cache.rb
@@ -4,7 +4,7 @@ module Cache
     class << self
 
       def store=(store)
-        Logging::Logger.log deprecation_warning, :warn
+        Makara::Logging::Logger.log deprecation_warning, :warn
       end
 
       private

diff --git a/lib/makara/config_parser.rb b/lib/makara/config_parser.rb
@@ -127,7 +127,7 @@ def database_from_path
     # NOTE: Does not use ENV['DATABASE_URL']
     def self.merge_and_resolve_default_url_config(config)
       if ENV['DATABASE_URL']
-        Logging::Logger.log "Please rename DATABASE_URL to use in the database.yml", :warn
+        Makara::Logging::Logger.log "Please rename DATABASE_URL to use in the database.yml", :warn
       end
       return config unless config.key?(:url)
       url = config[:url]
@@ -203,7 +203,7 @@ def sanitize_id(id)
 
       id.gsub(/[\|:]/, '').tap do |sanitized_id|
         if sanitized_id.size != id.size
-          Logging::Logger.log "Proxy id '#{id}' changed to '#{sanitized_id}'", :warn
+          Makara::Logging::Logger.log "Proxy id '#{id}' changed to '#{sanitized_id}'", :warn
         end
       end
     end

diff --git a/lib/makara/error_handler.rb b/lib/makara/error_handler.rb
@@ -25,13 +25,13 @@ def handle(connection)
 
     def gracefully(connection, e)
       err = Makara::Errors::BlacklistConnection.new(connection, e)
-      ::Makara::Logging::Logger.log("[Makara] Gracefully handling: #{err}")
+      ::Makara::Logging::Logger.log("Gracefully handling: #{err}")
       raise err
     end
 
 
     def harshly(e)
-      ::Makara::Logging::Logger.log("[Makara] Harshly handling: #{e}\n#{e.backtrace.join("\n\t")}")
+      ::Makara::Logging::Logger.log("Harshly handling: #{e}\n#{e.backtrace.join("\n\t")}")
       raise e
     end
 

diff --git a/lib/makara/logging/logger.rb b/lib/makara/logging/logger.rb
@@ -5,7 +5,7 @@ class Logger
       class << self
 
         def log(msg, format = :error)
-          logger.send(format, msg) if logger
+          logger.send(format, "[Makara] #{msg}") if logger
         end
 
         def logger