From c406e1575b1b7b0724f968f365e0ebd7fd7f20ea Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Tue, 24 Feb 2015 10:52:40 -0500 Subject: [PATCH 1/2] common logging for rackspace Signed-off-by: Evan Hazlett --- drivers/openstack/client.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/openstack/client.go b/drivers/openstack/client.go index 7a5581fa69..5051e8ad86 100644 --- a/drivers/openstack/client.go +++ b/drivers/openstack/client.go @@ -60,9 +60,7 @@ func (c *GenericClient) CreateInstance(d *Driver) (string, error) { } } - log.WithFields(log.Fields{ - "Name": d.MachineName, - }).Info("Creating machine...") + log.Info("Creating machine...") server, err := servers.Create(c.Compute, keypairs.CreateOptsExt{ serverOpts, From bebb2dc7189ec5aa4fef92d77285ec09aa75e4fc Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Tue, 24 Feb 2015 11:02:49 -0500 Subject: [PATCH 2/2] show detailed messages only in debug for rackspace remove Signed-off-by: Evan Hazlett --- drivers/openstack/openstack.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/openstack/openstack.go b/drivers/openstack/openstack.go index caa2baac3c..c049d22664 100644 --- a/drivers/openstack/openstack.go +++ b/drivers/openstack/openstack.go @@ -384,14 +384,15 @@ func (d *Driver) Stop() error { } func (d *Driver) Remove() error { - log.WithField("MachineId", d.MachineId).Info("Deleting OpenStack instance...") + log.WithField("MachineId", d.MachineId).Debug("deleting instance...") + log.Info("Deleting OpenStack instance...") if err := d.initCompute(); err != nil { return err } if err := d.client.DeleteInstance(d); err != nil { return err } - log.WithField("Name", d.KeyPairName).Info("Deleting Key Pair...") + log.WithField("Name", d.KeyPairName).Debug("deleting key pair...") if err := d.client.DeleteKeyPair(d, d.KeyPairName); err != nil { return err }