diff options
| author | Max Resnick <max@ofmax.li> | 2024-02-18 08:46:42 -0800 |
|---|---|---|
| committer | Max Resnick <max@ofmax.li> | 2024-02-18 08:46:42 -0800 |
| commit | 794445b230ddad08480f35d58f4694023e5f7006 (patch) | |
| tree | 544f5d5c8efbf02badca311cba6828c3f0fd0356 /internal | |
| parent | a889ec1d68eb4af4329890bd0de1d4a5282f3ac3 (diff) | |
| download | go-git-server-794445b230ddad08480f35d58f4694023e5f7006.tar.gz | |
fix: args/flags clean up, remove repobase from config
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/admin/middleware.go | 4 | ||||
| -rw-r--r-- | internal/admin/model.go | 4 | ||||
| -rw-r--r-- | internal/admin/service.go | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/internal/admin/middleware.go b/internal/admin/middleware.go index 60274ad..8b88c83 100644 --- a/internal/admin/middleware.go +++ b/internal/admin/middleware.go @@ -1,15 +1,13 @@ package admin import ( - "log" "net/http" ) // Hooks middleware to handle requests to the admin repo. func Hooks(adminSvc *Servicer, next http.Handler) http.Handler { return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { - log.Printf("stuffs about to reload %s", "now") - next.ServeHTTP(rw, req) go adminSvc.Reload() + next.ServeHTTP(rw, req) }) } diff --git a/internal/admin/model.go b/internal/admin/model.go index 2841e0a..bf97b0f 100644 --- a/internal/admin/model.go +++ b/internal/admin/model.go @@ -66,7 +66,7 @@ type ServerRepos struct { Name string `json:"name"` Version string `json:"version"` Repos []*GitRepo `json:"repos"` - BasePath string `json:"basepath"` + basePath string } func loadFromGit(gitURL, filePath string) ([]byte, error) { @@ -146,7 +146,7 @@ func (s *ServerRepos) ServerPolicies() [][]string { // ConfigureRepos run reconciler for all repos func (s *ServerRepos) ConfigureRepos() { for _, repo := range s.Repos { - repo.ReconcileRepo(s.BasePath) + repo.ReconcileRepo(s.basePath) } } diff --git a/internal/admin/service.go b/internal/admin/service.go index 1b5662d..498215b 100644 --- a/internal/admin/service.go +++ b/internal/admin/service.go @@ -69,6 +69,7 @@ func NewService(modelPath, policyPath, serverConfigPath, reposDir string, mgmtRe // log.error log.Fatalf("Coudln't load server config %s", err) } + conf.basePath = reposDir svc := &Servicer{ enf, conf, |