Skip to content

Commit

Permalink
Merge pull request #9 from Comcast/feature/integrate_initial_endpoints
Browse files Browse the repository at this point in the history
Bumped webpa-common; upgraded to the new Prepare API
  • Loading branch information
johnabass committed Aug 17, 2017
2 parents 2e483e2 + 233e935 commit 95d3e1e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
10 changes: 7 additions & 3 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,7 +2,7 @@ package: .
homepage: https://github.com/Comcast/petasos
import:
- package: github.com/Comcast/webpa-common
version: 941d20f74a51751286a478074e5cc04b73ccfbd9
version: dfa65be4308dd2cb47648d02aaeda1ae9090b12d
subpackages:
- concurrent
- device
Expand Down
9 changes: 5 additions & 4 deletions src/petasos/petasos.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ package main

import (
"fmt"
"net/http"
_ "net/http/pprof"
"os"

"github.com/Comcast/webpa-common/concurrent"
"github.com/Comcast/webpa-common/device"
"github.com/Comcast/webpa-common/server"
"github.com/Comcast/webpa-common/service"
"github.com/spf13/pflag"
"github.com/spf13/viper"
"net/http"
_ "net/http/pprof"
"os"
)

const (
Expand Down Expand Up @@ -67,7 +68,7 @@ func petasos(arguments []string) int {
logger,
)

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

Expand Down

0 comments on commit 95d3e1e

Please sign in to comment.