Improve log messages and simplify error logic

vmware · Feb 8, 2018 · dac4259 · dac4259
1 parent d0cbc66
commit dac4259
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/lib/install/management/resource_pool.go b/lib/install/management/resource_pool.go
@@ -102,22 +102,24 @@ func (d *Dispatcher) destroyResourcePoolIfEmpty(conf *config.VirtualContainerHos
 		d.op.Warn("Did not find parent VCH resource pool")
 		return nil
 	}
+
 	var vms []*vm.VirtualMachine
 	var err error
 	if vms, err = d.parentResourcepool.GetChildrenVMs(d.op, d.session); err != nil {
 		err = errors.Errorf("Unable to get children vm of resource pool %q: %s", d.parentResourcepool.Name(), err)
 		return err
 	}
+
 	if len(vms) != 0 {
-		err = errors.Errorf("Resource pool is not empty: %q", d.parentResourcepool.Name())
+		err = errors.Errorf("resource pool %s is not empty (has %d VMs)", d.parentResourcepool.Name(), len(vms))
 		return err
 	}
-	if _, err := tasks.WaitForResult(d.op, func(ctx context.Context) (tasks.Task, error) {
+
+	_, err = tasks.WaitForResult(d.op, func(ctx context.Context) (tasks.Task, error) {
 		return d.parentResourcepool.Destroy(ctx)
-	}); err != nil {
-		return err
-	}
-	return nil
+	})
+
+	return err
 }
 
 func (d *Dispatcher) findResourcePool(path string) (*object.ResourcePool, error) {

diff --git a/lib/portlayer/network/network.go b/lib/portlayer/network/network.go
@@ -134,7 +134,7 @@ func handleEvent(netctx *Context, ie events.Event) {
 		defer handle.Close()
 
 		if handle.Runtime.PowerState != types.VirtualMachinePowerStatePoweredOff {
-			op.Warnf("Live power state check on power off event shows %s: not unbinding network", ie.Reference(), handle.Runtime.PowerState)
+			op.Warnf("Live power state check on power off event for %s shows %s, therefore not unbinding network", ie.Reference(), handle.Runtime.PowerState)
 			return
 		}