From 64376538130907d54db46855c833794c1888abfd Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 13 Feb 2013 18:45:22 +0100 Subject: [PATCH] feature #1739: Fix wrong host vmware polling when libvirt returns warnings --- src/im_mad/remotes/vmware.d/vmware.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/im_mad/remotes/vmware.d/vmware.rb b/src/im_mad/remotes/vmware.d/vmware.rb index 41adb38c7f..13b52785be 100755 --- a/src/im_mad/remotes/vmware.d/vmware.rb +++ b/src/im_mad/remotes/vmware.d/vmware.rb @@ -86,10 +86,10 @@ end def get_vm_names rc, data = do_action("virsh -c #{@uri} --readonly list") - return [] if !rc - lines=data.split(/\n/)[2..-1] + data.gsub!(/^.*----$/m, '').strip! + lines=data.split(/\n/) lines.map do |line| line.split(/\s+/).delete_if {|d| d.empty? }[1] @@ -102,7 +102,6 @@ end def get_all_vm_info(host, vms) puts "VM_POLL=YES" - vms.each do |vm| info=get_vm_info(host, vm)