Skip to content

Commit 8985e62

Browse files
committed
Rename automation_log_wrapper
1 parent 4e22e7b commit 8985e62

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

lib/vmdb/loggers/request_logger.rb

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
module Vmdb::Loggers
22
class RequestLogger < ManageIQ::Loggers::Base
3-
attr_reader :automation_log_wrapper
3+
attr_reader :log_wrapper
44

5-
def initialize(*args, automation_log_wrapper:, **kwargs)
6-
@automation_log_wrapper = automation_log_wrapper
5+
def initialize(*args, log_wrapper:, **kwargs)
6+
@log_wrapper = log_wrapper
77
super(*args, **kwargs)
88
end
99

10-
def self.create_log_wrapper(io = File::NULL)
11-
# We modify the interface of logger methods such as info/warn/etc. to allow the keyword argument
12-
# resource_id. Therefore, we need to wrap all client logger calls to these methods to process the resource_id,
13-
# cut the request_log entry and forward the remaining arguments to the logger.
14-
new(io, :progname => "automation", :automation_log_wrapper => Vmdb::Loggers.create_logger("automation.log"))
15-
end
16-
1710
private def add_to_db(severity, message = nil, progname = nil, resource_id: nil)
1811
return [severity, message, progname] unless resource_id
1912

@@ -41,37 +34,37 @@ def self.create_log_wrapper(io = File::NULL)
4134

4235
def info(progname = nil, resource_id: nil, &block)
4336
severity, message, progname = add_to_db(INFO, nil, progname, resource_id: resource_id, &block)
44-
automation_log_wrapper.add(severity, message, progname, &block)
37+
log_wrapper.add(severity, message, progname, &block)
4538
add(severity, message, progname, &block)
4639
end
4740

4841
def debug(progname = nil, resource_id: nil, &block)
4942
severity, message, progname = add_to_db(DEBUG, nil, progname, resource_id: resource_id, &block)
50-
automation_log_wrapper.add(severity, message, progname, &block)
43+
log_wrapper.add(severity, message, progname, &block)
5144
add(severity, message, progname, &block)
5245
end
5346

5447
def warn(progname = nil, resource_id: nil, &block)
5548
severity, message, progname = add_to_db(WARN, nil, progname, resource_id: resource_id, &block)
56-
automation_log_wrapper.add(severity, message, progname, &block)
49+
log_wrapper.add(severity, message, progname, &block)
5750
add(severity, message, progname, &block)
5851
end
5952

6053
def error(progname = nil, resource_id: nil, &block)
6154
severity, message, progname = add_to_db(ERROR, nil, progname, resource_id: resource_id, &block)
62-
automation_log_wrapper.add(severity, message, progname, &block)
55+
log_wrapper.add(severity, message, progname, &block)
6356
add(severity, message, progname, &block)
6457
end
6558

6659
def fatal(progname = nil, resource_id: nil, &block)
6760
severity, message, progname = add_to_db(FATAL, nil, progname, resource_id: resource_id, &block)
68-
automation_log_wrapper.add(severity, message, progname, &block)
61+
log_wrapper.add(severity, message, progname, &block)
6962
add(severity, message, progname, &block)
7063
end
7164

7265
def unknown(progname = nil, resource_id: nil, &block)
7366
severity, message, progname = add_to_db(UNKNOWN, nil, progname, resource_id: resource_id, &block)
74-
automation_log_wrapper.add(severity, message, progname, &block)
67+
log_wrapper.add(severity, message, progname, &block)
7568
add(severity, message, progname, &block)
7669
end
7770
end

0 commit comments

Comments
 (0)