daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3772 from thaJeztah/registry_logging_simplify 

registry: configureLogging() simplify logic a bit
master
Hayley Swimelar 2022-11-08 09:17:20 +01:00 committed by GitHub
parent c7758d1637 b73c038000
commit e9a25da7a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
registry/registry.go
View File

@ -71,15 +71,16 @@ var defaultCipherSuites = []uint16{
tls.TLS_AES_256_GCM_SHA384, tls.TLS_AES_256_GCM_SHA384,
} }
// maps tls version strings to constants const defaultTLSVersionStr = "tls1.2"
var (
defaultTLSVersionStr = "tls1.2" // tlsVersions maps user-specified values to tls version constants.
tlsVersions = map[string]uint16{ var tlsVersions = map[string]uint16{
// user specified values "tls1.2": tls.VersionTLS12,
"tls1.2": tls.VersionTLS12, "tls1.3": tls.VersionTLS13,
"tls1.3": tls.VersionTLS13, }
}
) // defaultLogFormatter is the default formatter to use for logs.
const defaultLogFormatter = "text"
// this channel gets notified when process receives signal. It is global to ease unit testing // this channel gets notified when process receives signal. It is global to ease unit testing
var quit = make(chan os.Signal, 1) var quit = make(chan os.Signal, 1)
@ -130,6 +131,7 @@ var ServeCmd = &cobra.Command{
} }
// A Registry represents a complete instance of the registry. // A Registry represents a complete instance of the registry.
//
// TODO(aaronl): It might make sense for Registry to become an interface. // TODO(aaronl): It might make sense for Registry to become an interface.
type Registry struct { type Registry struct {
config *configuration.Configuration config *configuration.Configuration
@ -346,7 +348,7 @@ func configureLogging(ctx context.Context, config *configuration.Configuration)
formatter := config.Log.Formatter formatter := config.Log.Formatter
if formatter == "" { if formatter == "" {
formatter = "text" // default formatter formatter = defaultLogFormatter
} }
switch formatter { switch formatter {
@ -364,16 +366,10 @@ func configureLogging(ctx context.Context, config *configuration.Configuration)
Formatter: &logrus.JSONFormatter{TimestampFormat: time.RFC3339Nano}, Formatter: &logrus.JSONFormatter{TimestampFormat: time.RFC3339Nano},
}) })
default: default:
// just let the library use default on empty string. return ctx, fmt.Errorf("unsupported logging formatter: %q", formatter)
if config.Log.Formatter != "" {
return ctx, fmt.Errorf("unsupported logging formatter: %q", config.Log.Formatter)
}
}
if config.Log.Formatter != "" {
logrus.Debugf("using %q logging formatter", config.Log.Formatter)
} }
logrus.Debugf("using %q logging formatter", formatter)
if len(config.Log.Fields) > 0 { if len(config.Log.Fields) > 0 {
// build up the static fields, if present. // build up the static fields, if present.
var fields []interface{} var fields []interface{}