Skip to content

Commit

Permalink
Merge pull request #20 from Comcast/feature/webhookIntegration
Browse files Browse the repository at this point in the history
Feature/webhookIntegration
  • Loading branch information
schmidtw authored Jun 15, 2017
2 parents 7b20a31 + 87cf2aa commit 42592c2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
12 changes: 10 additions & 2 deletions src/caduceus/caduceus.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@ func caduceus(arguments []string) int {
webhookFactory.Initialize(mux, selfURL, webhookHandler, logger)
webhookFactory.PrepareAndStart()



caduceusHealth := &CaduceusHealth{}
var runnable concurrent.Runnable

Expand All @@ -158,6 +156,16 @@ func caduceus(arguments []string) int {

logger.Info("Caduceus is up and running!")

// Attempt to obtain the current listener list from current system without having to wait for listener reregistration.
startChan := make(chan webhook.Result, 1)
webhookFactory.Start.GetCurrentSystemsHooks(startChan)
var webhookStartResults webhook.Result = <- startChan
if webhookStartResults.Error != nil {
logger.Error(webhookStartResults.Error)
} else {
webhookRegistry.Update(webhookStartResults.Hooks)
}

var (
signals = make(chan os.Signal, 1)
)
Expand Down
10 changes: 5 additions & 5 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
@@ -1,7 +1,7 @@
package: .
import:
- package: github.com/Comcast/webpa-common
version: 9dfc3db86d11729a233b1b788f00b501c59c1fff
version: b6156ba40c5a41f41efeb331ef90d43e699076c1
subpackages:
- concurrent
- handler
Expand Down

0 comments on commit 42592c2

Please sign in to comment.