Skip to content

Commit

Permalink
Upgraded webpa-common to pull in the metrics changes
Browse files Browse the repository at this point in the history
  • Loading branch information
johnabass committed Dec 11, 2017
1 parent 9ad70c4 commit c7878cc
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 18 deletions.
29 changes: 16 additions & 13 deletions src/glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ package: .
homepage: https://github.com/Comcast/petasos
import:
- package: github.com/Comcast/webpa-common
version: 83d899053e41996424c18cb1559c97b87a5084f6
version: e630982de53ef5a555610825c4dbca78c097549d
8 changes: 4 additions & 4 deletions src/petasos/petasos.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ func petasos(arguments []string) int {
f = pflag.NewFlagSet(applicationName, pflag.ContinueOnError)
v = viper.New()

logger, webPA, err = server.Initialize(applicationName, arguments, f, v)
infoLog = logging.Info(logger)
errorLog = logging.Error(logger)
logger, metricsRegistry, webPA, err = server.Initialize(applicationName, arguments, f, v)
infoLog = logging.Info(logger)
errorLog = logging.Error(logger)
)

if err != nil {
Expand Down Expand Up @@ -92,7 +92,7 @@ func petasos(arguments []string) int {
RedirectCode: http.StatusTemporaryRedirect,
}

_, runnable = webPA.Prepare(logger, nil, redirectHandler)
_, runnable = webPA.Prepare(logger, nil, metricsRegistry, redirectHandler)
signals = make(chan os.Signal, 1)
)

Expand Down

0 comments on commit c7878cc

Please sign in to comment.