@@ -56,35 +56,25 @@ def self.create_logger(log_file_name, logger_class = ManageIQ::Loggers::Base)
56
56
end
57
57
58
58
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
60
61
61
62
progname = progname_from_file ( log_file_name )
62
63
logger . progname = progname
63
64
64
65
create_wrapper_logger ( progname , logger_class , logger )
65
66
end
66
67
67
- private_class_method def self . create_raw_container_logger
68
- require "manageiq/loggers/container"
69
- ManageIQ ::Loggers ::Container . new
70
- end
71
-
72
68
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
74
71
75
72
progname = progname_from_file ( log_file_name )
76
73
logger . progname = progname
77
74
78
75
create_wrapper_logger ( progname , logger_class , logger )
79
76
end
80
77
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
-
88
78
private_class_method def self . log_path_from_file ( log_file )
89
79
log_file = Pathname . new ( log_file ) if log_file . kind_of? ( String )
90
80
log_file = ManageIQ . root . join ( "log" , log_file ) if log_file . try ( :dirname ) . to_s == "."
0 commit comments