github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-24 11:41:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added webhook functionality to the git middleware.

Browse Source 
The webhook providers reside behind a small interface which determines if
a provider should run. If a provider should run it delegates
responsibility of the request to the provider.
ghdeploy initial commit

Added webhook functionality to the git middleware.
The webhook providers reside behind a small interface which determines if a provider should run. If a provider should run it delegates responsibility of the request to the provider.

Add tests

Remove old implementation

Fix inconsistency with git interval pulling.

Remove '\n' from logging statements and put the initial pull into a startup function
This commit is contained in:
xenolf
2015-06-03 01:29:33 +02:00
parent 4852f0580b
commit b4780a41d3
5 changed files with 303 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
config/setup/git.go
View File

@ -11,6 +11,7 @@ import (
"github.com/mholt/caddy/middleware"
"github.com/mholt/caddy/middleware/git"
"github.com/mholt/caddy/middleware/git/webhook"
)
// Git configures a new Git service routine.
@ -20,13 +21,30 @@ func Git(c *Controller) (middleware.Middleware, error) {
return nil, err
}
c.Startup = append(c.Startup, func() error {
// Start service routine in background
git.Start(repo)
// If a HookUrl is set, we switch to event based pulling.
// Install the url handler
if repo.HookUrl != "" {
// Do a pull right away to return error
return repo.Pull()
})
c.Startup = append(c.Startup, func() error {
return repo.Pull()
})
webhook := &webhook.WebHook{Repo: repo}
return func(next middleware.Handler) middleware.Handler {
webhook.Next = next
return webhook
}, nil
} else {
c.Startup = append(c.Startup, func() error {
// Start service routine in background
git.Start(repo)
// Do a pull right away to return error
return repo.Pull()
})
}
return nil, err
}
@ -75,6 +93,17 @@ func gitParse(c *Controller) (*git.Repo, error) {
if t > 0 {
repo.Interval = time.Duration(t) * time.Second
}
case "hook":
if !c.NextArg() {
return nil, c.ArgErr()
}
repo.HookUrl = c.Val()
// optional secret for validation
if c.NextArg() {
repo.HookSecret = c.Val()
}
case "then":
thenArgs := c.RemainingArgs()
if len(thenArgs) == 0 {