diff --git a/lib/vmdb/loggers.rb b/lib/vmdb/loggers.rb index 582693868d5..f5a104d98a5 100644 --- a/lib/vmdb/loggers.rb +++ b/lib/vmdb/loggers.rb @@ -1,7 +1,6 @@ +require 'manageiq' require 'util/vmdb-logger' -Dir.glob(File.join(File.dirname(__FILE__), "loggers", "*")).each { |f| require f } - module Vmdb def self.logger $log @@ -38,10 +37,10 @@ def self.apply_config(config) private def self.create_loggers - path_dir = Rails.root.join("log") + path_dir = ManageIQ.root.join("log") $log = VMDBLogger.new(path_dir.join("evm.log")) - $rails_log = VMDBLogger.new(path_dir.join("#{Rails.env}.log")) + $rails_log = VMDBLogger.new(path_dir.join("#{ManageIQ.env}.log")) $audit_log = AuditLogger.new(path_dir.join("audit.log")) $fog_log = FogLogger.new(path_dir.join("fog.log")) $policy_log = VMDBLogger.new(path_dir.join("policy.log")) @@ -80,3 +79,5 @@ def self.apply_config_value(config, logger, key) end end end + +Dir.glob(File.join(File.dirname(__FILE__), "loggers", "*")).each { |f| require f } diff --git a/lib/vmdb/logging.rb b/lib/vmdb/logging.rb index 8a8326be594..483f4074333 100644 --- a/lib/vmdb/logging.rb +++ b/lib/vmdb/logging.rb @@ -4,8 +4,15 @@ module Vmdb class LogProxy < Struct.new(:klass, :separator) LEVELS = [:debug, :info, :warn, :error] - delegate *LEVELS.map { |level| :"#{level}?" }, - :log_backtrace, :level, :to => :logger + # def debug? + # def info? + # def warn? + # def error? + # def log_backtrace + # def level + (LEVELS.map { |l| :"#{l}?" } + [:log_backtrace, :level]).each do |method| + define_method(method) { |*args| logger.send(method, *args) } + end LEVELS.each do |level| define_method(level) do |msg = nil, &blk|