From 58bb6e76c91d967c0caec444b327fb5e22f4fe1b Mon Sep 17 00:00:00 2001 From: Clinton Kitson Date: Mon, 19 Oct 2015 20:25:35 -0700 Subject: [PATCH] Update default logging level --- core/config/config_keymap.go | 2 +- core/config/config_test.go | 4 ++-- drivers/os/linux/linux.go | 2 +- drivers/storage/ec2/ec2.go | 2 +- drivers/storage/openstack/openstack.go | 2 +- drivers/storage/rackspace/rackspace.go | 2 +- drivers/storage/scaleio/scaleio.go | 5 +++-- drivers/storage/xtremio/xtremio.go | 2 +- drivers/volume/docker/volume.go | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/core/config/config_keymap.go b/core/config/config_keymap.go index 4b97ca0a6..73e11bdd8 100644 --- a/core/config/config_keymap.go +++ b/core/config/config_keymap.go @@ -149,7 +149,7 @@ func initConfigKeyMap() { Host: ck("REXRAY_HOST", "tcp://:7979", "The REX-Ray service address"), - LogLevel: ck("REXRAY_LOGLEVEL", "info", + LogLevel: ck("REXRAY_LOGLEVEL", "warn", "The log level (panic, fatal, error, warn, info, debug)"), StorageDrivers: ck("REXRAY_STORAGEDRIVERS", []string{}, diff --git a/core/config/config_test.go b/core/config/config_test.go index 8ad48f409..5db9afc21 100644 --- a/core/config/config_test.go +++ b/core/config/config_test.go @@ -65,8 +65,8 @@ func TestAssertConfigDefaults(t *testing.T) { t.Fatalf("c.Host != tcp://:7979, == %s", c.Host) } - if c.LogLevel != "info" { - t.Fatalf("c.LogLevel != info, == %d", c.LogLevel) + if c.LogLevel != "warn" { + t.Fatalf("c.LogLevel != warn, == %d", c.LogLevel) } if len(c.OSDrivers) != 1 && c.OSDrivers[0] != "linux" { diff --git a/drivers/os/linux/linux.go b/drivers/os/linux/linux.go index 7df9146b1..343b88c98 100644 --- a/drivers/os/linux/linux.go +++ b/drivers/os/linux/linux.go @@ -32,7 +32,7 @@ func newDriver() core.Driver { func (d *driver) Init(r *core.RexRay) error { if runtime.GOOS == "linux" { d.r = r - log.WithField("provider", providerName).Debug( + log.WithField("provider", providerName).Info( "os driver initialized") return nil } diff --git a/drivers/storage/ec2/ec2.go b/drivers/storage/ec2/ec2.go index 274c5bae9..2c8eef59a 100644 --- a/drivers/storage/ec2/ec2.go +++ b/drivers/storage/ec2/ec2.go @@ -75,7 +75,7 @@ func (d *driver) Init(r *core.RexRay) error { aws.Regions[region], ) - log.WithField("provider", providerName).Debug("storage driver initialized") + log.WithField("provider", providerName).Info("storage driver initialized") return nil } diff --git a/drivers/storage/openstack/openstack.go b/drivers/storage/openstack/openstack.go index 212e8544e..a83800c34 100644 --- a/drivers/storage/openstack/openstack.go +++ b/drivers/storage/openstack/openstack.go @@ -126,7 +126,7 @@ func (d *driver) Init(r *core.RexRay) error { "error getting newBlockStorageV1", err) } - log.WithField("provider", providerName).Debug("storage driver initialized") + log.WithField("provider", providerName).Info("storage driver initialized") return nil } diff --git a/drivers/storage/rackspace/rackspace.go b/drivers/storage/rackspace/rackspace.go index 89bf1da62..658285af2 100644 --- a/drivers/storage/rackspace/rackspace.go +++ b/drivers/storage/rackspace/rackspace.go @@ -112,7 +112,7 @@ func (d *driver) Init(r *core.RexRay) error { "error getting newBlockStorageV1", err) } - log.WithField("provider", providerName).Debug("storage driver initialized") + log.WithField("provider", providerName).Info("storage driver initialized") return nil } diff --git a/drivers/storage/scaleio/scaleio.go b/drivers/storage/scaleio/scaleio.go index 1ee7621d4..0bf9767da 100644 --- a/drivers/storage/scaleio/scaleio.go +++ b/drivers/storage/scaleio/scaleio.go @@ -1,11 +1,12 @@ package scaleio import ( - log "github.com/Sirupsen/logrus" "strconv" "strings" "time" + log "github.com/Sirupsen/logrus" + "github.com/emccode/goscaleio" types "github.com/emccode/goscaleio/types/v1" @@ -124,7 +125,7 @@ func (d *driver) Init(r *core.RexRay) error { return errors.WithFieldsE(fields, "error finding sdc", err) } - log.WithField("provider", providerName).Debug("storage driver initialized") + log.WithField("provider", providerName).Info("storage driver initialized") return nil } diff --git a/drivers/storage/xtremio/xtremio.go b/drivers/storage/xtremio/xtremio.go index 21bbe1436..a3ceb9736 100644 --- a/drivers/storage/xtremio/xtremio.go +++ b/drivers/storage/xtremio/xtremio.go @@ -103,7 +103,7 @@ func (d *xtremIODriver) Init(r *core.RexRay) error { } } - log.WithField("provider", providerName).Debug("storage driver initialized") + log.WithField("provider", providerName).Info("storage driver initialized") return nil } diff --git a/drivers/volume/docker/volume.go b/drivers/volume/docker/volume.go index 2776a5645..264c5c420 100644 --- a/drivers/volume/docker/volume.go +++ b/drivers/volume/docker/volume.go @@ -37,7 +37,7 @@ func newDriver() core.Driver { func (d *driver) Init(r *core.RexRay) error { d.r = r - log.WithField("provider", providerName).Debug("volume driver initialized") + log.WithField("provider", providerName).Info("volume driver initialized") return nil }