Skip to content

Commit b8aabc6

Browse files
committed
Drop the raw_create_* logger methods
1 parent 86b127a commit b8aabc6

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

lib/vmdb/loggers.rb

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,35 +56,25 @@ def self.create_logger(log_file_name, logger_class = ManageIQ::Loggers::Base)
5656
end
5757

5858
private_class_method def self.create_container_logger(log_file_name, logger_class)
59-
return nil unless (logger = create_raw_container_logger)
59+
require "manageiq/loggers/container"
60+
logger = ManageIQ::Loggers::Container.new
6061

6162
progname = progname_from_file(log_file_name)
6263
logger.progname = progname
6364

6465
create_wrapper_logger(progname, logger_class, logger)
6566
end
6667

67-
private_class_method def self.create_raw_container_logger
68-
require "manageiq/loggers/container"
69-
ManageIQ::Loggers::Container.new
70-
end
71-
7268
private_class_method def self.create_journald_logger(log_file_name, logger_class)
73-
return nil unless (logger = create_raw_journald_logger)
69+
require "manageiq/loggers/journald"
70+
logger = ManageIQ::Loggers::Journald.new
7471

7572
progname = progname_from_file(log_file_name)
7673
logger.progname = progname
7774

7875
create_wrapper_logger(progname, logger_class, logger)
7976
end
8077

81-
private_class_method def self.create_raw_journald_logger
82-
require "manageiq/loggers/journald"
83-
ManageIQ::Loggers::Journald.new
84-
rescue LoadError
85-
nil
86-
end
87-
8878
private_class_method def self.log_path_from_file(log_file)
8979
log_file = Pathname.new(log_file) if log_file.kind_of?(String)
9080
log_file = ManageIQ.root.join("log", log_file) if log_file.try(:dirname).to_s == "."

0 commit comments

Comments
 (0)