CERBERUS/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2026-08-03 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: post pull command. retries after pull failure.

Browse source
This commit is contained in:
Abiola Ibrahim 2015-05-02 01:44:51 +01:00
parent 782ba32457
commit 9cd1587cf7
3 changed files with 139 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

21
middleware/git/git.go
View file

@ -4,6 +4,7 @@ import (
"fmt"
"log"
"net/url"
"os"
"path/filepath"
"runtime"
"strconv"
@ -56,7 +57,7 @@ func parse(c middleware.Controller) (*Repo, error) {
switch len(args) {
case 2:
repo.Path = filepath.Join(c.Root(), args[1])
repo.Path = filepath.Clean(c.Root() + string(filepath.Separator) + args[1])
fallthrough
case 1:
repo.Url = args[0]
@ -73,7 +74,7 @@ func parse(c middleware.Controller) (*Repo, error) {
if !c.NextArg() {
return nil, c.ArgErr()
}
repo.Path = filepath.Join(c.Root(), c.Val())
repo.Path = filepath.Clean(c.Root() + string(filepath.Separator) + c.Val())
case "branch":
if !c.NextArg() {
return nil, c.ArgErr()
@ -92,6 +93,12 @@ func parse(c middleware.Controller) (*Repo, error) {
if t > 0 {
repo.Interval = time.Duration(t) * time.Second
}
case "then":
thenArgs := c.RemainingArgs()
if len(thenArgs) == 0 {
return nil, c.ArgErr()
}
repo.Then = strings.Join(thenArgs, " ")
}
}
}
@ -125,7 +132,7 @@ func parse(c middleware.Controller) (*Repo, error) {
return nil, err
}
return repo, prepare(repo)
return repo, repo.prepare()
}
// sanitizeHttp cleans up repository url and converts to https format
@ -165,3 +172,11 @@ func sanitizeGit(repoUrl string) (string, string, error) {
host := hostUrl[:i]
return repoUrl, host, nil
}
// logger is an helper function to retrieve the available logger
func logger() *log.Logger {
if Logger == nil {
Logger = log.New(os.Stderr, "", log.LstdFlags)
}
return Logger
}