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 #334 from BrianBland/configOmitEmpty

Browse Source 
Adds omitempty to several configuration fields
This commit is contained in:
Stephen Day 2015-04-07 20:02:29 -07:00
commit 5a4f66b2f8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configuration/configuration.go
View File

@ -24,16 +24,16 @@ type Configuration struct {
// Formatter overrides the default formatter with another. Options
// include "text", "json" and "logstash".
Formatter string `yaml:"formatter"`
Formatter string `yaml:"formatter,omitempty"`
// Fields allows users to specify static string fields to include in
// the logger context.
Fields map[string]interface{} `yaml:"fields"`
Fields map[string]interface{} `yaml:"fields,omitempty"`
}
// Loglevel is the level at which registry operations are logged. This is
// deprecated. Please use Log.Level in the future.
Loglevel Loglevel `yaml:"loglevel"`
Loglevel Loglevel `yaml:"loglevel,omitempty"`
// Storage is the configuration for the registry's storage driver
Storage Storage `yaml:"storage"`

4
configuration/configuration_test.go
View File

@ -18,8 +18,8 @@ var configStruct = Configuration{
Version: "0.1",
Log: struct {
Level Loglevel `yaml:"level"`
Formatter string `yaml:"formatter"`
Fields map[string]interface{} `yaml:"fields"`
Formatter string `yaml:"formatter,omitempty"`
Fields map[string]interface{} `yaml:"fields,omitempty"`
}{
Fields: map[string]interface{}{"environment": "test"},
},