vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #360 from RichardScothern/gorelic-verbose

Browse source 
Enable configuration of new relic STDOUT logging
This commit is contained in:
Stephen Day 2015-04-14 14:55:17 -07:00
commit ab2499df98
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AUTHORS
View file

@ -12,11 +12,13 @@ Diogo Mónica <diogo.monica@gmail.com>
Donald Huang <don.hcd@gmail.com> Donald Huang <don.hcd@gmail.com>
Frederick F. Kautz IV <fkautz@alumni.cmu.edu> Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
Josh Hawn <josh.hawn@docker.com> Josh Hawn <josh.hawn@docker.com>
Kenneth Lim <kennethlimcp@gmail.com>
Mary Anthony <mary@docker.com> Mary Anthony <mary@docker.com>
Nathan Sullivan <nathan@nightsys.net> Nathan Sullivan <nathan@nightsys.net>
Nghia Tran <tcnghia@gmail.com> Nghia Tran <tcnghia@gmail.com>
Olivier Gambier <olivier@docker.com> Olivier Gambier <olivier@docker.com>
Richard <richard.scothern@gmail.com> Richard <richard.scothern@gmail.com>
Richard Scothern <richard.scothern@docker.com>
Shreyas Karnik <karnik.shreyas@gmail.com> Shreyas Karnik <karnik.shreyas@gmail.com>
Simon Thulbourn <simon+github@thulbourn.com> Simon Thulbourn <simon+github@thulbourn.com>
Stephen J Day <stephen.day@docker.com> Stephen J Day <stephen.day@docker.com>

2
cmd/registry/main.go
View file

@ -175,7 +175,7 @@ func configureReporting(app *handlers.App) http.Handler {
agent.NewrelicName = app.Config.Reporting.NewRelic.Name agent.NewrelicName = app.Config.Reporting.NewRelic.Name
} }
agent.CollectHTTPStat = true agent.CollectHTTPStat = true
agent.Verbose = true agent.Verbose = app.Config.Reporting.NewRelic.Verbose
agent.Run() agent.Run()
handler = agent.WrapHTTPHandler(handler) handler = agent.WrapHTTPHandler(handler)

2
configuration/configuration.go
View file

@ -356,6 +356,8 @@ type NewRelicReporting struct {
LicenseKey string `yaml:"licensekey,omitempty"` LicenseKey string `yaml:"licensekey,omitempty"`
// Name is the component name of the registry in NewRelic // Name is the component name of the registry in NewRelic
Name string `yaml:"name,omitempty"` Name string `yaml:"name,omitempty"`
// Verbose configures debug output to STDOUT
Verbose bool `yaml:"verbose,omitempty"`
} }
// Middleware configures named middlewares to be applied at injection points. // Middleware configures named middlewares to be applied at injection points.

2
configuration/configuration_test.go
View file

@ -351,7 +351,7 @@ func copyConfig(config Configuration) *Configuration {
} }
configCopy.Reporting = Reporting{ configCopy.Reporting = Reporting{
Bugsnag: BugsnagReporting{config.Reporting.Bugsnag.APIKey, config.Reporting.Bugsnag.ReleaseStage, config.Reporting.Bugsnag.Endpoint}, Bugsnag: BugsnagReporting{config.Reporting.Bugsnag.APIKey, config.Reporting.Bugsnag.ReleaseStage, config.Reporting.Bugsnag.Endpoint},
NewRelic: NewRelicReporting{config.Reporting.NewRelic.LicenseKey, config.Reporting.NewRelic.Name}, NewRelic: NewRelicReporting{config.Reporting.NewRelic.LicenseKey, config.Reporting.NewRelic.Name, config.Reporting.NewRelic.Verbose},
} }
configCopy.Auth = Auth{config.Auth.Type(): Parameters{}} configCopy.Auth = Auth{config.Auth.Type(): Parameters{}}