From af3240fa18b2b434be4a9f300f81e816ffd7ff4d Mon Sep 17 00:00:00 2001 From: Andy Bakun Date: Thu, 2 Jan 2014 04:30:38 -0600 Subject: [PATCH 1/2] docs(server/config.go): minor formatting changes When -version or -help are given, don't warn about having to derive the data directory name. Print warnings about deprecated options on separate lines so the log isn't screwy. --- server/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/config.go b/server/config.go index 75585e860..0f27b8674 100644 --- a/server/config.go +++ b/server/config.go @@ -277,7 +277,7 @@ func (c *Config) LoadFlags(arguments []string) error { // Print deprecation warnings on STDERR. f.Visit(func(f *flag.Flag) { if len(newFlagNameLookup[f.Name]) > 0 { - fmt.Fprintf(os.Stderr, "[deprecated] use -%s, not -%s", newFlagNameLookup[f.Name], f.Name) + fmt.Fprintf(os.Stderr, "[deprecated] use -%s, not -%s\n", newFlagNameLookup[f.Name], f.Name) } }) @@ -416,7 +416,7 @@ func (c *Config) Sanitize() error { c.NameFromHostname() } - if c.DataDir == "" && c.Name != "" { + if c.DataDir == "" && c.Name != "" && !c.ShowVersion && !c.ShowHelp { c.DataDirFromName() } From 5b105ed1566fab5bbb30ece3623c21439cfa9bf4 Mon Sep 17 00:00:00 2001 From: Andy Bakun Date: Thu, 2 Jan 2014 11:11:27 -0600 Subject: [PATCH 2/2] fix deprecated option tests --- server/config_test.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/server/config_test.go b/server/config_test.go index 002996983..2cab7d610 100644 --- a/server/config_test.go +++ b/server/config_test.go @@ -532,7 +532,7 @@ func TestConfigDeprecatedAddrFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.Addr, "127.0.0.1:4002") }) - assert.Equal(t, stderr, "[deprecated] use -addr, not -c") + assert.Equal(t, stderr, "[deprecated] use -addr, not -c\n") } func TestConfigDeprecatedBindAddrFlag(t *testing.T) { @@ -542,7 +542,7 @@ func TestConfigDeprecatedBindAddrFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.BindAddr, "127.0.0.1:4003", "") }) - assert.Equal(t, stderr, "[deprecated] use -bind-addr, not -cl", "") + assert.Equal(t, stderr, "[deprecated] use -bind-addr, not -cl\n", "") } func TestConfigDeprecatedCAFileFlag(t *testing.T) { @@ -552,7 +552,7 @@ func TestConfigDeprecatedCAFileFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.CAFile, "/tmp/file.ca", "") }) - assert.Equal(t, stderr, "[deprecated] use -ca-file, not -clientCAFile", "") + assert.Equal(t, stderr, "[deprecated] use -ca-file, not -clientCAFile\n", "") } func TestConfigDeprecatedCertFileFlag(t *testing.T) { @@ -562,7 +562,7 @@ func TestConfigDeprecatedCertFileFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.CertFile, "/tmp/file.cert", "") }) - assert.Equal(t, stderr, "[deprecated] use -cert-file, not -clientCert", "") + assert.Equal(t, stderr, "[deprecated] use -cert-file, not -clientCert\n", "") } func TestConfigDeprecatedKeyFileFlag(t *testing.T) { @@ -572,7 +572,7 @@ func TestConfigDeprecatedKeyFileFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.KeyFile, "/tmp/file.key", "") }) - assert.Equal(t, stderr, "[deprecated] use -key-file, not -clientKey", "") + assert.Equal(t, stderr, "[deprecated] use -key-file, not -clientKey\n", "") } func TestConfigDeprecatedPeersFlag(t *testing.T) { @@ -582,7 +582,7 @@ func TestConfigDeprecatedPeersFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.Peers, []string{"coreos.com:4001", "coreos.com:4002"}, "") }) - assert.Equal(t, stderr, "[deprecated] use -peers, not -C", "") + assert.Equal(t, stderr, "[deprecated] use -peers, not -C\n", "") } func TestConfigDeprecatedPeersFileFlag(t *testing.T) { @@ -592,7 +592,7 @@ func TestConfigDeprecatedPeersFileFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.PeersFile, "/tmp/machines", "") }) - assert.Equal(t, stderr, "[deprecated] use -peers-file, not -CF", "") + assert.Equal(t, stderr, "[deprecated] use -peers-file, not -CF\n", "") } func TestConfigDeprecatedMaxClusterSizeFlag(t *testing.T) { @@ -602,7 +602,7 @@ func TestConfigDeprecatedMaxClusterSizeFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.MaxClusterSize, 5, "") }) - assert.Equal(t, stderr, "[deprecated] use -max-cluster-size, not -maxsize", "") + assert.Equal(t, stderr, "[deprecated] use -max-cluster-size, not -maxsize\n", "") } func TestConfigDeprecatedMaxResultBufferFlag(t *testing.T) { @@ -612,7 +612,7 @@ func TestConfigDeprecatedMaxResultBufferFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.MaxResultBuffer, 512, "") }) - assert.Equal(t, stderr, "[deprecated] use -max-result-buffer, not -m", "") + assert.Equal(t, stderr, "[deprecated] use -max-result-buffer, not -m\n", "") } func TestConfigDeprecatedMaxRetryAttemptsFlag(t *testing.T) { @@ -622,7 +622,7 @@ func TestConfigDeprecatedMaxRetryAttemptsFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.MaxRetryAttempts, 10, "") }) - assert.Equal(t, stderr, "[deprecated] use -max-retry-attempts, not -r", "") + assert.Equal(t, stderr, "[deprecated] use -max-retry-attempts, not -r\n", "") } func TestConfigDeprecatedNameFlag(t *testing.T) { @@ -632,7 +632,7 @@ func TestConfigDeprecatedNameFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.Name, "test-name", "") }) - assert.Equal(t, stderr, "[deprecated] use -name, not -n", "") + assert.Equal(t, stderr, "[deprecated] use -name, not -n\n", "") } func TestConfigDeprecatedPeerAddrFlag(t *testing.T) { @@ -642,7 +642,7 @@ func TestConfigDeprecatedPeerAddrFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.Peer.Addr, "localhost:7002", "") }) - assert.Equal(t, stderr, "[deprecated] use -peer-addr, not -s", "") + assert.Equal(t, stderr, "[deprecated] use -peer-addr, not -s\n", "") } func TestConfigDeprecatedPeerBindAddrFlag(t *testing.T) { @@ -652,7 +652,7 @@ func TestConfigDeprecatedPeerBindAddrFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.Peer.BindAddr, "127.0.0.1:4003", "") }) - assert.Equal(t, stderr, "[deprecated] use -peer-bind-addr, not -sl", "") + assert.Equal(t, stderr, "[deprecated] use -peer-bind-addr, not -sl\n", "") } func TestConfigDeprecatedPeerCAFileFlag(t *testing.T) { @@ -662,7 +662,7 @@ func TestConfigDeprecatedPeerCAFileFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.Peer.CAFile, "/tmp/peer/file.ca", "") }) - assert.Equal(t, stderr, "[deprecated] use -peer-ca-file, not -serverCAFile", "") + assert.Equal(t, stderr, "[deprecated] use -peer-ca-file, not -serverCAFile\n", "") } func TestConfigDeprecatedPeerCertFileFlag(t *testing.T) { @@ -672,7 +672,7 @@ func TestConfigDeprecatedPeerCertFileFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.Peer.CertFile, "/tmp/peer/file.cert", "") }) - assert.Equal(t, stderr, "[deprecated] use -peer-cert-file, not -serverCert", "") + assert.Equal(t, stderr, "[deprecated] use -peer-cert-file, not -serverCert\n", "") } func TestConfigDeprecatedPeerKeyFileFlag(t *testing.T) { @@ -682,7 +682,7 @@ func TestConfigDeprecatedPeerKeyFileFlag(t *testing.T) { assert.NoError(t, err) assert.Equal(t, c.Peer.KeyFile, "/tmp/peer/file.key", "") }) - assert.Equal(t, stderr, "[deprecated] use -peer-key-file, not -serverKey", "") + assert.Equal(t, stderr, "[deprecated] use -peer-key-file, not -serverKey\n", "") } //--------------------------------------