Skip to content

Commit 2525459

Browse files
committed
Use ManageIQ::Loggers
1 parent bf9e93c commit 2525459

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

workers/event_catcher/event_catcher.rb

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
require_relative "event_parser"
22

33
class EventCatcher
4-
def initialize(ems_id, default_endpoint, default_authentication, messaging, page_size = 20)
5-
@ems_id = ems_id
4+
def initialize(ems, default_endpoint, default_authentication, messaging, logger, page_size = 20)
5+
@ems_id = ems["id"]
66
@default_endpoint = default_endpoint
77
@default_authentication = default_authentication
8+
@logger = logger
89
@messaging = messaging
910
@page_size = page_size
1011
end
@@ -16,13 +17,13 @@ def run!
1617

1718
notify_started
1819

19-
puts "Collecting events..."
20+
logger.info("Collecting events...")
2021
wait_for_updates(vim) do |property_change|
21-
puts property_change.name
22+
logger.info(property_change.name)
2223
next unless property_change.name.match?(/latestPage.*/)
2324

2425
events = Array(property_change.val).map { |event| EventParser.parse_event(event).merge(:ems_id => ems_id) }
25-
puts events.to_json
26+
logger.info(events.to_json)
2627
publish_events(events)
2728
end
2829
rescue Interrupt
@@ -39,7 +40,7 @@ def stop!
3940

4041
private
4142

42-
attr_reader :ems_id, :default_endpoint, :default_authentication, :messaging, :page_size
43+
attr_reader :ems_id, :default_endpoint, :default_authentication, :logger, :messaging, :page_size
4344

4445
def connect
4546
vim_opts = {

workers/event_catcher/event_parser.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ def self.parse_event(event)
1313
sub_event_type = "PowerOnVM_Task" if event.fullFormattedMessage.to_s.downcase == "task: power on virtual machine"
1414
sub_event_type ||= "DrsMigrateVM_Task" if event.info&.descriptionId == "Drm.ExecuteVMotionLRO"
1515
if sub_event_type.nil?
16-
puts "Event Type cannot be determined for TaskEvent. Using generic eventType [TaskEvent] instead"
1716
sub_event_type = "TaskEvent"
1817
end
1918
when "Rename_Task", "Destroy_Task"

workers/event_catcher/worker

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ require "bundler/inline"
55
gemfile do
66
source "https://rubygems.org"
77

8+
gem "manageiq-loggers", "~>1.0"
89
gem "manageiq-messaging", "~> 1.0"
910
gem "rbvmomi2", "~> 3.3"
1011
gem "sd_notify"
@@ -18,15 +19,20 @@ def setproctitle
1819
Process.setproctitle(proc_title)
1920
end
2021

22+
def build_logger
23+
ManageIQ::Loggers::Base.new($stdout) # TODO: build container/journal/base logger
24+
end
25+
2126
def main(args)
2227
setproctitle
2328

24-
ems = args["ems"].detect { |e| e["type"] == "ManageIQ::Providers::Vmware::InfraManager" }
25-
default_endpoint = ems["endpoints"].detect { |ep| ep["role"] == "default" }
26-
default_authentication = ems["authentications"].detect { |auth| auth["authtype"] == "default" }
27-
messaging = args["messaging"].symbolize_keys
29+
logger = build_logger
30+
ems = args["ems"].detect { |e| e["type"] == "ManageIQ::Providers::Vmware::InfraManager" }
31+
messaging = args["messaging"].symbolize_keys
32+
endpoint = ems["endpoints"].detect { |ep| ep["role"] == "default" }
33+
authentication = ems["authentications"].detect { |auth| auth["authtype"] == "default" }
2834

29-
EventCatcher.new(ems["id"], default_endpoint, default_authentication, messaging).run!
35+
EventCatcher.new(ems, endpoint, authentication, messaging, logger).run!
3036
end
3137

3238
def parse_args

0 commit comments

Comments
 (0)