diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-12-03 17:02:28 +0300 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-12-03 17:02:28 +0300 |
commit | 07c5914b25d90c69407358d63c2192b3eb0eabab (patch) | |
tree | 3bc0ee09455569b36054ba415ce8cc8a82fc2ac1 | |
parent | f2a4b8f7669ba871eac24c80cb775057ed03e39f (diff) | |
parent | 5aa9613c570de8316ddf2335acb1d33a38fa4ee1 (diff) |
Merge branch 'revert-e2148d83' into 'master'
Revert "Merge branch 'jc-fix-unstructured-startup-logging' into 'master'"
See merge request gitlab-org/gitaly!1669
-rw-r--r-- | cmd/gitaly/main.go | 15 | ||||
-rw-r--r-- | cmd/praefect/main.go | 7 |
2 files changed, 7 insertions, 15 deletions
diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go index 8635084a7..f8860df2c 100644 --- a/cmd/gitaly/main.go +++ b/cmd/gitaly/main.go @@ -46,12 +46,6 @@ func main() { flag.Usage = flagUsage flag.Parse() - configPath := flag.Arg(0) - if err := loadConfig(configPath); err != nil { - log.WithError(err).WithField("config_path", configPath).Fatal("load config") - } - config.ConfigureLogging() - // gitaly-wrapper is supposed to set config.EnvUpgradesEnabled in order to enable graceful upgrades _, isWrapped := os.LookupEnv(config.EnvUpgradesEnabled) b, err := bootstrap.New(os.Getenv(config.EnvPidFile), isWrapped) @@ -72,6 +66,12 @@ func main() { log.WithField("version", version.GetVersionString()).Info("Starting Gitaly") + configPath := flag.Arg(0) + if err := loadConfig(configPath); err != nil { + log.WithError(err).WithField("config_path", configPath).Fatal("load config") + } + + config.ConfigureLogging() sentry.ConfigureSentry(version.GetVersion(), sentry.Config(config.Config.Logging.Sentry)) config.ConfigurePrometheus() config.ConfigureConcurrencyLimits() @@ -145,12 +145,9 @@ func run(b *bootstrap.Bootstrap) error { return fmt.Errorf("unable to start the bootstrap: %v", err) } - log.Info("Bootstrap started") - if err := servers.StartRuby(); err != nil { return fmt.Errorf("initialize gitaly-ruby: %v", err) } - log.Info("Bootstrap waiting") return b.Wait() } diff --git a/cmd/praefect/main.go b/cmd/praefect/main.go index b0b3063a1..8fb6c0c9c 100644 --- a/cmd/praefect/main.go +++ b/cmd/praefect/main.go @@ -138,12 +138,7 @@ func run(cfgs []starter.Config, conf config.Config) error { return fmt.Errorf("unable to start the bootstrap: %v", err) } - logger.Info("Bootstrap started") - - go func() { - logger.Info("Bootstrap waiting") - serverErrors <- b.Wait() - }() + go func() { serverErrors <- b.Wait() }() go func() { serverErrors <- repl.ProcessBacklog(ctx) }() go coordinator.FailoverRotation() |