From 58a603448a410bb9cdecb1c52052df629eee8aad Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Wed, 25 Apr 2018 11:42:32 -0700 Subject: [PATCH] *: rename to "--log-outputs" in docs Signed-off-by: Gyuho Lee --- Documentation/op-guide/configuration.md | 2 +- Procfile | 6 +++--- embed/config_test.go | 2 +- functional.yaml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/op-guide/configuration.md b/Documentation/op-guide/configuration.md index e48eff9e2..1a5cd4d6b 100644 --- a/Documentation/op-guide/configuration.md +++ b/Documentation/op-guide/configuration.md @@ -317,7 +317,7 @@ The security flags help to [build a secure etcd cluster][security]. + default: capnslog + env variable: ETCD_LOGGER -### --log-output +### --log-outputs + Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd, or list of comma separated output targets. + default: default + env variable: ETCD_LOG_OUTPUT diff --git a/Procfile b/Procfile index 7026895ad..ca9b053c6 100644 --- a/Procfile +++ b/Procfile @@ -1,5 +1,5 @@ # Use goreman to run `go get github.com/mattn/goreman` -etcd1: bin/etcd --name infra1 --listen-client-urls http://127.0.0.1:2379 --advertise-client-urls http://127.0.0.1:2379 --listen-peer-urls http://127.0.0.1:12380 --initial-advertise-peer-urls http://127.0.0.1:12380 --initial-cluster-token etcd-cluster-1 --initial-cluster 'infra1=http://127.0.0.1:12380,infra2=http://127.0.0.1:22380,infra3=http://127.0.0.1:32380' --initial-cluster-state new --enable-pprof --logger zap --log-output stderr -etcd2: bin/etcd --name infra2 --listen-client-urls http://127.0.0.1:22379 --advertise-client-urls http://127.0.0.1:22379 --listen-peer-urls http://127.0.0.1:22380 --initial-advertise-peer-urls http://127.0.0.1:22380 --initial-cluster-token etcd-cluster-1 --initial-cluster 'infra1=http://127.0.0.1:12380,infra2=http://127.0.0.1:22380,infra3=http://127.0.0.1:32380' --initial-cluster-state new --enable-pprof --logger zap --log-output stderr -etcd3: bin/etcd --name infra3 --listen-client-urls http://127.0.0.1:32379 --advertise-client-urls http://127.0.0.1:32379 --listen-peer-urls http://127.0.0.1:32380 --initial-advertise-peer-urls http://127.0.0.1:32380 --initial-cluster-token etcd-cluster-1 --initial-cluster 'infra1=http://127.0.0.1:12380,infra2=http://127.0.0.1:22380,infra3=http://127.0.0.1:32380' --initial-cluster-state new --enable-pprof --logger zap --log-output stderr +etcd1: bin/etcd --name infra1 --listen-client-urls http://127.0.0.1:2379 --advertise-client-urls http://127.0.0.1:2379 --listen-peer-urls http://127.0.0.1:12380 --initial-advertise-peer-urls http://127.0.0.1:12380 --initial-cluster-token etcd-cluster-1 --initial-cluster 'infra1=http://127.0.0.1:12380,infra2=http://127.0.0.1:22380,infra3=http://127.0.0.1:32380' --initial-cluster-state new --enable-pprof --logger zap --log-outputs stderr +etcd2: bin/etcd --name infra2 --listen-client-urls http://127.0.0.1:22379 --advertise-client-urls http://127.0.0.1:22379 --listen-peer-urls http://127.0.0.1:22380 --initial-advertise-peer-urls http://127.0.0.1:22380 --initial-cluster-token etcd-cluster-1 --initial-cluster 'infra1=http://127.0.0.1:12380,infra2=http://127.0.0.1:22380,infra3=http://127.0.0.1:32380' --initial-cluster-state new --enable-pprof --logger zap --log-outputs stderr +etcd3: bin/etcd --name infra3 --listen-client-urls http://127.0.0.1:32379 --advertise-client-urls http://127.0.0.1:32379 --listen-peer-urls http://127.0.0.1:32380 --initial-advertise-peer-urls http://127.0.0.1:32380 --initial-cluster-token etcd-cluster-1 --initial-cluster 'infra1=http://127.0.0.1:12380,infra2=http://127.0.0.1:22380,infra3=http://127.0.0.1:32380' --initial-cluster-state new --enable-pprof --logger zap --log-outputs stderr #proxy: bin/etcd grpc-proxy start --endpoints=127.0.0.1:2379,127.0.0.1:22379,127.0.0.1:32379 --listen-addr=127.0.0.1:23790 --advertise-client-url=127.0.0.1:23790 --enable-pprof diff --git a/embed/config_test.go b/embed/config_test.go index ef3d9dde1..60b7c6d03 100644 --- a/embed/config_test.go +++ b/embed/config_test.go @@ -34,7 +34,7 @@ func TestConfigFileOtherFields(t *testing.T) { PeerSecurityCfgFile securityConfig `json:"peer-transport-security"` ForceNewCluster bool `json:"force-new-cluster"` Logger string `json:"logger"` - LogOutputs []string `json:"log-output"` + LogOutputs []string `json:"log-outputs"` Debug bool `json:"debug"` }{ ctls, diff --git a/functional.yaml b/functional.yaml index a5e6cd7b6..ec3a5998a 100644 --- a/functional.yaml +++ b/functional.yaml @@ -34,7 +34,7 @@ agent-configs: pre-vote: true initial-corrupt-check: true logger: zap - log-output: [/tmp/etcd-functional-1/etcd.log] + log-outputs: [/tmp/etcd-functional-1/etcd.log] debug: true client-cert-data: "" client-cert-path: "" @@ -85,7 +85,7 @@ agent-configs: pre-vote: true initial-corrupt-check: true logger: zap - log-output: [/tmp/etcd-functional-2/etcd.log] + log-outputs: [/tmp/etcd-functional-2/etcd.log] debug: true client-cert-data: "" client-cert-path: "" @@ -136,7 +136,7 @@ agent-configs: pre-vote: true initial-corrupt-check: true logger: zap - log-output: [/tmp/etcd-functional-3/etcd.log] + log-outputs: [/tmp/etcd-functional-3/etcd.log] debug: true client-cert-data: "" client-cert-path: ""