diff options
| author | Max Resnick <max@ofmax.li> | 2024-08-30 23:06:18 -0700 |
|---|---|---|
| committer | Max Resnick <max@ofmax.li> | 2024-08-30 23:06:18 -0700 |
| commit | 09e8ea66b75e8ac6e90942ab37814e9e1633afac (patch) | |
| tree | e56a5d71923e6a3b0a44f732629fafedfe6f971a /internal/admin/service.go | |
| parent | 4d55e5d1dc56c421344f88aebf01deec2daa7bbe (diff) | |
| download | go-git-server-09e8ea66b75e8ac6e90942ab37814e9e1633afac.tar.gz | |
fix: handle basepath correctly
Diffstat (limited to '')
| -rw-r--r-- | internal/admin/service.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/internal/admin/service.go b/internal/admin/service.go index d60a072..f3d705c 100644 --- a/internal/admin/service.go +++ b/internal/admin/service.go @@ -27,11 +27,15 @@ func (s *Servicer) Reload() { slog.Error("refusing to reload config") return } - oldConfig := s.Conf + slog.Debug("config base after load", "path", tmpConfig.basePath) + // copy + oldConfig := *s.Conf + slog.Debug("config base before copy", "path", s.Conf.basePath) s.Conf = tmpConfig + slog.Debug("config base after copy", "path", s.Conf.basePath) if err := s.InitServer(); err != nil { slog.Error("couldn't init server with new config, falling back", err) - s.Conf = oldConfig + s.Conf = &oldConfig if err := s.InitServer(); err != nil { slog.Error("couldn't init server with old config, falling back", err) panic("new and old config couldn't init server, no available config to run") @@ -66,6 +70,7 @@ func (s *Servicer) InitServer() error { } slog.Info("policy loaded") slog.Debug("init server", "repoDir", s.reposDir) + slog.Debug("init server", "repoDir", s.Conf.basePath) if err := s.Conf.ConfigureRepos(); err != nil { return fmt.Errorf("couldn't configure repos %w", err) } @@ -92,7 +97,6 @@ func NewService(modelPath, policyPath, serverConfigPath, reposDir string, mgmtRe } else if err != nil { return &Servicer{}, fmt.Errorf("Coudln't load server config. %w", err) } - conf.basePath = reposDir svc := &Servicer{ enf, conf, |