diff options
| author | James Fargher <proglottis@gmail.com> | 2021-06-16 04:55:06 +0300 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2021-06-16 04:55:06 +0300 |
| commit | 16b767c0446a66eb87ca2fd12d4a481d221efa74 (patch) | |
| tree | 80f7fd5d02787055441d1adcf0d64881ae0133b4 | |
| parent | 86d069ca736dfde9fa61f8476e974c7b8c15a1e9 (diff) | |
| parent | d7a8c3abbb87dd7544b8a824fbbe0447ed5d841d (diff) | |
Merge branch 'smh-fix-socket-path-handling' into 'master'
Fix Unix socket address handling following gRPC upgrade
Closes #3664
See merge request gitlab-org/gitaly!3592
| -rw-r--r-- | cmd/praefect/subcmd_reconcile.go | 2 | ||||
| -rw-r--r-- | internal/gitaly/server/server_factory.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/praefect/subcmd_reconcile.go b/cmd/praefect/subcmd_reconcile.go index e3075bdfc..47917501f 100644 --- a/cmd/praefect/subcmd_reconcile.go +++ b/cmd/praefect/subcmd_reconcile.go @@ -58,7 +58,7 @@ func (s *reconcileSubcommand) Exec(flags *flag.FlagSet, conf config.Config) erro func getNodeAddress(cfg config.Config) (string, error) { switch { case cfg.SocketPath != "": - return "unix://" + cfg.SocketPath, nil + return "unix:" + cfg.SocketPath, nil case cfg.ListenAddr != "": return "tcp://" + cfg.ListenAddr, nil default: diff --git a/internal/gitaly/server/server_factory.go b/internal/gitaly/server/server_factory.go index 497a30a97..82456e0b9 100644 --- a/internal/gitaly/server/server_factory.go +++ b/internal/gitaly/server/server_factory.go @@ -55,7 +55,7 @@ func (s *GitalyServerFactory) StartWorkers(ctx context.Context, l logrus.FieldLo )) } - cc, err := client.Dial("unix://"+cfg.GitalyInternalSocketPath(), opts) + cc, err := client.Dial("unix:"+cfg.GitalyInternalSocketPath(), opts) if err != nil { return nil, err } |