github.com/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution synced 2024-11-12 05:45:51 +01:00
Code Releases Wiki Activity

Merge pull request #3934 from stonezdj/add_caller_info

Browse Source 
Add option to enable caller information in logger
This commit is contained in:
Wang Yan 2023-06-11 21:53:14 +08:00 committed by GitHub
commit 6a57630cf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configuration/configuration.go
View File

@ -42,6 +42,9 @@ type Configuration struct {
// Hooks allows users to configure the log hooks, to enabling the // Hooks allows users to configure the log hooks, to enabling the
// sequent handling behavior, when defined levels of log message emit. // sequent handling behavior, when defined levels of log message emit.
Hooks []LogHook `yaml:"hooks,omitempty"` Hooks []LogHook `yaml:"hooks,omitempty"`
// ReportCaller allows user to configure the log to report the caller
ReportCaller bool `yaml:"reportcaller,omitempty"`
} }
// Loglevel is the level at which registry operations are logged. // Loglevel is the level at which registry operations are logged.

9
configuration/configuration_test.go
View File

@ -23,10 +23,11 @@ var configStruct = Configuration{
AccessLog struct { AccessLog struct {
Disabled bool `yaml:"disabled,omitempty"` Disabled bool `yaml:"disabled,omitempty"`
} `yaml:"accesslog,omitempty"` } `yaml:"accesslog,omitempty"`
Level Loglevel `yaml:"level,omitempty"` Level Loglevel `yaml:"level,omitempty"`
Formatter string `yaml:"formatter,omitempty"` Formatter string `yaml:"formatter,omitempty"`
Fields map[string]interface{} `yaml:"fields,omitempty"` Fields map[string]interface{} `yaml:"fields,omitempty"`
Hooks []LogHook `yaml:"hooks,omitempty"` Hooks []LogHook `yaml:"hooks,omitempty"`
ReportCaller bool `yaml:"reportcaller,omitempty"`
}{ }{
Level: "info", Level: "info",
Fields: map[string]interface{}{"environment": "test"}, Fields: map[string]interface{}{"environment": "test"},

1
registry/registry.go
View File

@ -350,6 +350,7 @@ func configureReporting(app *handlers.App) http.Handler {
// configuration. // configuration.
func configureLogging(ctx context.Context, config *configuration.Configuration) (context.Context, error) { func configureLogging(ctx context.Context, config *configuration.Configuration) (context.Context, error) {
logrus.SetLevel(logLevel(config.Log.Level)) logrus.SetLevel(logLevel(config.Log.Level))
logrus.SetReportCaller(config.Log.ReportCaller)
formatter := config.Log.Formatter formatter := config.Log.Formatter
if formatter == "" { if formatter == "" {