|
1 | 1 | module Vmdb::Loggers
|
2 | 2 | class RequestLogger < ManageIQ::Loggers::Base
|
3 |
| - attr_reader :automation_log_wrapper |
| 3 | + attr_reader :log_wrapper |
4 | 4 |
|
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 |
7 | 7 | super(*args, **kwargs)
|
8 | 8 | end
|
9 | 9 |
|
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 |
| - |
17 | 10 | private def add_to_db(severity, message = nil, progname = nil, resource_id: nil)
|
18 | 11 | return [severity, message, progname] unless resource_id
|
19 | 12 |
|
@@ -41,37 +34,37 @@ def self.create_log_wrapper(io = File::NULL)
|
41 | 34 |
|
42 | 35 | def info(progname = nil, resource_id: nil, &block)
|
43 | 36 | 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) |
45 | 38 | add(severity, message, progname, &block)
|
46 | 39 | end
|
47 | 40 |
|
48 | 41 | def debug(progname = nil, resource_id: nil, &block)
|
49 | 42 | 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) |
51 | 44 | add(severity, message, progname, &block)
|
52 | 45 | end
|
53 | 46 |
|
54 | 47 | def warn(progname = nil, resource_id: nil, &block)
|
55 | 48 | 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) |
57 | 50 | add(severity, message, progname, &block)
|
58 | 51 | end
|
59 | 52 |
|
60 | 53 | def error(progname = nil, resource_id: nil, &block)
|
61 | 54 | 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) |
63 | 56 | add(severity, message, progname, &block)
|
64 | 57 | end
|
65 | 58 |
|
66 | 59 | def fatal(progname = nil, resource_id: nil, &block)
|
67 | 60 | 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) |
69 | 62 | add(severity, message, progname, &block)
|
70 | 63 | end
|
71 | 64 |
|
72 | 65 | def unknown(progname = nil, resource_id: nil, &block)
|
73 | 66 | 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) |
75 | 68 | add(severity, message, progname, &block)
|
76 | 69 | end
|
77 | 70 | end
|
|
0 commit comments