diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-06-04 16:18:08 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-06-04 16:26:40 +0300 |
| commit | 9f421054d1483db93d11502877c758938dbc5f9b (patch) | |
| tree | 19e3ae936dee9bd3245769991f60071dbf1ffaed /internal | |
| parent | 43bd39ba6f5162be872e1e0c1b4a65fcf1377ca5 (diff) | |
Praefect configuration fixes
Today I've tried to determine the state of the praefect project, and had
to find out a couple of things which I tried to make easier for the ones
that will do the same later.
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/bootstrap/bootstrap.go | 2 | ||||
| -rw-r--r-- | internal/config/config.go | 2 | ||||
| -rw-r--r-- | internal/praefect/config/testdata/config.toml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go index bfb58066c..41c1c7d89 100644 --- a/internal/bootstrap/bootstrap.go +++ b/internal/bootstrap/bootstrap.go @@ -171,7 +171,7 @@ func (b *Bootstrap) waitGracePeriod(kill <-chan os.Signal) error { func (b *Bootstrap) listen(network, path string) (net.Listener, error) { if network == "unix" && b.isFirstBoot() { - if err := os.Remove(path); err != nil && !os.IsNotExist(err) { + if err := os.RemoveAll(path); err != nil { return nil, err } } diff --git a/internal/config/config.go b/internal/config/config.go index 5a7e26be6..e0bcdb98f 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -84,7 +84,7 @@ type Storage struct { // Logging contains the logging configuration for Gitaly type Logging struct { - Format string + Format string `toml:"format"` SentryDSN string `toml:"sentry_dsn"` RubySentryDSN string `toml:"ruby_sentry_dsn"` SentryEnvironment string `toml:"sentry_environment"` diff --git a/internal/praefect/config/testdata/config.toml b/internal/praefect/config/testdata/config.toml index 24f64add9..81701a359 100644 --- a/internal/praefect/config/testdata/config.toml +++ b/internal/praefect/config/testdata/config.toml @@ -16,7 +16,7 @@ prometheus_listen_addr = "" listen_addr = "tcp://gitaly-backup2.example.com" [logging] - Format = "" + format = "" sentry_dsn = "" ruby_sentry_dsn = "" level = "" |