From c359a6d1726c2547ceb5914a3a3fb3c5acaea46f Mon Sep 17 00:00:00 2001 From: Richard Date: Tue, 14 Apr 2015 13:16:10 -0700 Subject: [PATCH] Enable configuration of new relic STDOUT logging --- AUTHORS | 2 ++ cmd/registry/main.go | 2 +- configuration/configuration.go | 2 ++ configuration/configuration_test.go | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 0889d1eb..1038a5b1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,11 +12,13 @@ Diogo Mónica Donald Huang Frederick F. Kautz IV Josh Hawn +Kenneth Lim Mary Anthony Nathan Sullivan Nghia Tran Olivier Gambier Richard +Richard Scothern Shreyas Karnik Simon Thulbourn Stephen J Day diff --git a/cmd/registry/main.go b/cmd/registry/main.go index 29d393c7..d4d40094 100644 --- a/cmd/registry/main.go +++ b/cmd/registry/main.go @@ -175,7 +175,7 @@ func configureReporting(app *handlers.App) http.Handler { agent.NewrelicName = app.Config.Reporting.NewRelic.Name } agent.CollectHTTPStat = true - agent.Verbose = true + agent.Verbose = app.Config.Reporting.NewRelic.Verbose agent.Run() handler = agent.WrapHTTPHandler(handler) diff --git a/configuration/configuration.go b/configuration/configuration.go index f34135aa..3d302e1c 100644 --- a/configuration/configuration.go +++ b/configuration/configuration.go @@ -356,6 +356,8 @@ type NewRelicReporting struct { LicenseKey string `yaml:"licensekey,omitempty"` // Name is the component name of the registry in NewRelic 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. diff --git a/configuration/configuration_test.go b/configuration/configuration_test.go index 10937223..5c5d68b3 100644 --- a/configuration/configuration_test.go +++ b/configuration/configuration_test.go @@ -351,7 +351,7 @@ func copyConfig(config Configuration) *Configuration { } configCopy.Reporting = Reporting{ 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{}}