[CORE-824] Disallow configuring logs in text format

pachyderm · Aug 23, 2022 · db292f4 · db292f4
1 parent 6b423ae
commit db292f4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/etc/helm/pachyderm/templates/NOTES.txt b/etc/helm/pachyderm/templates/NOTES.txt
@@ -10,6 +10,10 @@ pachctl config set active-context local
 pachctl port-forward
 {{- end -}}
 
+{{- if eq .Values.pachd.logFormat "text" }}
+WARNING: setting log format to text is not supported. Defaulting to json
+{{- end -}}
+
 {{ if and (.Values.oidc.mockIDP) (.Values.pachd.enterpriseLicenseKey) (.Values.pachd.activateAuth) }}
 WARNING: Your cluster is configured with a default login of admin:password
 {{- end -}}

diff --git a/src/internal/middleware/logging/util.go b/src/internal/middleware/logging/util.go
@@ -24,10 +24,7 @@ type Option func(*config)
 
 func WithLogFormat(fmt string) func(*config) {
 	return func(cfg *config) {
-		if fmt != "text" {
-			cfg.format = "json"
-		}
-		cfg.format = fmt
+		cfg.format = "json"
 	}
 }
 
@@ -67,9 +64,6 @@ func NewLoggingInterceptor(logger *logrus.Logger, opts ...Option) *LoggingInterc
 		opt(cfg)
 	}
 	logger.Formatter = log.FormatterFunc(log.JSONPretty)
-	if cfg.format == "text" {
-		logger.Formatter = log.FormatterFunc(log.Pretty)
-	}
 
 	interceptor := &LoggingInterceptor{
 		logger,

diff --git a/src/server/cmd/pachd/main.go b/src/server/cmd/pachd/main.go
@@ -176,9 +176,6 @@ func setup(config interface{}, service string) (env *serviceenv.NonblockingServi
 		log.Printf("no Jaeger collector found (JAEGER_COLLECTOR_SERVICE_HOST not set)")
 	}
 	env = serviceenv.InitWithKube(serviceenv.NewConfiguration(config))
-	if env.Config().LogFormat == "text" {
-		log.SetFormatter(logutil.FormatterFunc(logutil.Pretty))
-	}
 	profileutil.StartCloudProfiler(service, env.Config())
 	debug.SetGCPercent(env.Config().GCPercent)
 	if env.Config().EtcdPrefix == "" {

diff --git a/src/server/cmd/worker/main.go b/src/server/cmd/worker/main.go
@@ -37,9 +37,6 @@ func do(ctx context.Context, config interface{}) error {
 	env := serviceenv.InitWithKube(serviceenv.NewConfiguration(config))
 
 	log.SetFormatter(logutil.FormatterFunc(logutil.JSONPretty))
-	if env.Config().LogFormat == "text" {
-		log.SetFormatter(logutil.FormatterFunc(logutil.Pretty))
-	}
 
 	// Enable cloud profilers if the configuration allows.
 	profileutil.StartCloudProfiler("pachyderm-worker", env.Config())