diff --git a/src/im_mad/remotes/kvm-probes.d/host/system/wild_vm.rb b/src/im_mad/remotes/kvm-probes.d/host/system/wild_vm.rb index 83f1afad1e..849d516d9d 100755 --- a/src/im_mad/remotes/kvm-probes.d/host/system/wild_vm.rb +++ b/src/im_mad/remotes/kvm-probes.d/host/system/wild_vm.rb @@ -4,4 +4,9 @@ require_relative '../../../lib/kvm' KVM.load_conf -puts DomainList.wilds_info +begin + puts DomainList.info +rescue StandardError => e + STDERR.puts e.message + exit(-1) +end diff --git a/src/im_mad/remotes/kvm-probes.d/vm/monitor/poll.rb b/src/im_mad/remotes/kvm-probes.d/vm/monitor/poll.rb index bfdbe0987a..849d516d9d 100755 --- a/src/im_mad/remotes/kvm-probes.d/vm/monitor/poll.rb +++ b/src/im_mad/remotes/kvm-probes.d/vm/monitor/poll.rb @@ -4,4 +4,9 @@ require_relative '../../../lib/kvm' KVM.load_conf -puts DomainList.info +begin + puts DomainList.info +rescue StandardError => e + STDERR.puts e.message + exit(-1) +end diff --git a/src/im_mad/remotes/kvm-probes.d/vm/status/state.rb b/src/im_mad/remotes/kvm-probes.d/vm/status/state.rb index 77a19af5b0..e76c1aed62 100755 --- a/src/im_mad/remotes/kvm-probes.d/vm/status/state.rb +++ b/src/im_mad/remotes/kvm-probes.d/vm/status/state.rb @@ -26,5 +26,6 @@ begin puts vmdb.to_status rescue StandardError => e - puts e + STDERR.puts e.message + exit(-1) end diff --git a/src/im_mad/remotes/lib/kvm.rb b/src/im_mad/remotes/lib/kvm.rb index 0402ececd2..e00e1ad06b 100644 --- a/src/im_mad/remotes/lib/kvm.rb +++ b/src/im_mad/remotes/lib/kvm.rb @@ -89,15 +89,18 @@ module ProcessList def self.retrieve_names text, _e, s = KVM.virsh(:list, '') - names = [] - return names if s.exitstatus != 0 + if s.exitstatus != 0 + raise 'Error retrieving names. Check Libvirtd service is up.' + end lines = text.split(/\n/)[2..-1] + # rubocop:disable Style/RedundantAssignment names = lines.map do |line| line.split(/\s+/).delete_if {|d| d.empty? }[1] end + # rubocop:enable Style/RedundantAssignment names end diff --git a/src/monitor/src/monitor/MonitorDriverProtocol.cc b/src/monitor/src/monitor/MonitorDriverProtocol.cc index 314491218f..323742ed81 100644 --- a/src/monitor/src/monitor/MonitorDriverProtocol.cc +++ b/src/monitor/src/monitor/MonitorDriverProtocol.cc @@ -67,7 +67,6 @@ void MonitorDriverProtocol::_monitor_vm(message_t msg) NebulaLog::warn("MDP", "Failed to monitor VM for host " + to_string(msg->oid()) + ": " + msg->payload()); - hm->error_monitor(msg->oid(), msg->payload()); return; } @@ -276,7 +275,6 @@ void MonitorDriverProtocol::_state_vm(message_t msg) NebulaLog::warn("MDP", "Failed to monitor VM state for host " + to_string(msg->oid()) + ": " + msg->payload()); - hm->error_monitor(msg->oid(), msg->payload()); return; }