diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-02-06 17:38:16 +0300 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-02-06 17:38:16 +0300 |
commit | 44617907069597b8a6e9e1b373465a429e90215a (patch) | |
tree | dd0a5adf20054be38b7725a1f8988eaefddd9b07 | |
parent | 8a549719107d4acfe843289ceed388113997c396 (diff) | |
parent | 4b06f6d7b16e39e91cd4da12de0a5070b3dcfa53 (diff) |
Merge branch 'zj-remove-unused-rubyservers' into 'master'
Remove unused rubyserver in structs
See merge request gitlab-org/gitaly!1807
-rw-r--r-- | changelogs/unreleased/zj-remove-unused-rubyservers.yml | 5 | ||||
-rw-r--r-- | internal/service/commit/server.go | 6 | ||||
-rw-r--r-- | internal/service/commit/testhelper_test.go | 11 | ||||
-rw-r--r-- | internal/service/diff/server.go | 5 | ||||
-rw-r--r-- | internal/service/diff/testhelper_test.go | 11 | ||||
-rw-r--r-- | internal/service/register.go | 4 |
6 files changed, 12 insertions, 30 deletions
diff --git a/changelogs/unreleased/zj-remove-unused-rubyservers.yml b/changelogs/unreleased/zj-remove-unused-rubyservers.yml new file mode 100644 index 000000000..5d16dbdb2 --- /dev/null +++ b/changelogs/unreleased/zj-remove-unused-rubyservers.yml @@ -0,0 +1,5 @@ +--- +title: Remove unused rubyserver in structs +merge_request: 1807 +author: +type: other diff --git a/internal/service/commit/server.go b/internal/service/commit/server.go index 3efecfc91..6eb0ce681 100644 --- a/internal/service/commit/server.go +++ b/internal/service/commit/server.go @@ -1,13 +1,11 @@ package commit import ( - "gitlab.com/gitlab-org/gitaly/internal/rubyserver" "gitlab.com/gitlab-org/gitaly/internal/service/ref" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" ) type server struct { - ruby *rubyserver.Server gitalypb.UnimplementedCommitServiceServer } @@ -16,6 +14,6 @@ var ( ) // NewServer creates a new instance of a grpc CommitServiceServer -func NewServer(rs *rubyserver.Server) gitalypb.CommitServiceServer { - return &server{ruby: rs} +func NewServer() gitalypb.CommitServiceServer { + return &server{} } diff --git a/internal/service/commit/testhelper_test.go b/internal/service/commit/testhelper_test.go index 2c140392a..b4621af6a 100644 --- a/internal/service/commit/testhelper_test.go +++ b/internal/service/commit/testhelper_test.go @@ -6,8 +6,6 @@ import ( "testing" "github.com/golang/protobuf/ptypes/timestamp" - log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/rubyserver" "gitlab.com/gitlab-org/gitaly/internal/testhelper" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc" @@ -20,16 +18,9 @@ func TestMain(m *testing.M) { os.Exit(testMain(m)) } -var rubyServer = &rubyserver.Server{} - func testMain(m *testing.M) int { defer testhelper.MustHaveNoChildProcess() - if err := rubyServer.Start(); err != nil { - log.Fatal(err) - } - defer rubyServer.Stop() - return m.Run() } @@ -42,7 +33,7 @@ func startTestServices(t testing.TB) (*grpc.Server, string) { t.Fatal("failed to start server") } - gitalypb.RegisterCommitServiceServer(server, NewServer(rubyServer)) + gitalypb.RegisterCommitServiceServer(server, NewServer()) reflection.Register(server) go server.Serve(listener) diff --git a/internal/service/diff/server.go b/internal/service/diff/server.go index e0ab04eb9..22520a33f 100644 --- a/internal/service/diff/server.go +++ b/internal/service/diff/server.go @@ -1,7 +1,6 @@ package diff import ( - "gitlab.com/gitlab-org/gitaly/internal/rubyserver" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" ) @@ -9,14 +8,12 @@ const msgSizeThreshold = 5 * 1024 type server struct { MsgSizeThreshold int - ruby *rubyserver.Server gitalypb.UnimplementedDiffServiceServer } // NewServer creates a new instance of a gRPC DiffServer -func NewServer(rs *rubyserver.Server) gitalypb.DiffServiceServer { +func NewServer() gitalypb.DiffServiceServer { return &server{ MsgSizeThreshold: msgSizeThreshold, - ruby: rs, } } diff --git a/internal/service/diff/testhelper_test.go b/internal/service/diff/testhelper_test.go index 67742e7e1..c8bb4219c 100644 --- a/internal/service/diff/testhelper_test.go +++ b/internal/service/diff/testhelper_test.go @@ -5,8 +5,6 @@ import ( "os" "testing" - log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/rubyserver" "gitlab.com/gitlab-org/gitaly/internal/testhelper" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc" @@ -17,16 +15,9 @@ func TestMain(m *testing.M) { os.Exit(testMain(m)) } -var rubyServer = &rubyserver.Server{} - func testMain(m *testing.M) int { defer testhelper.MustHaveNoChildProcess() - if err := rubyServer.Start(); err != nil { - log.Fatal(err) - } - defer rubyServer.Stop() - return m.Run() } @@ -39,7 +30,7 @@ func runDiffServer(t *testing.T) (*grpc.Server, string) { t.Fatal(err) } - gitalypb.RegisterDiffServiceServer(server, NewServer(rubyServer)) + gitalypb.RegisterDiffServiceServer(server, NewServer()) reflection.Register(server) go server.Serve(listener) diff --git a/internal/service/register.go b/internal/service/register.go index 317e0a2a3..5f2e168ec 100644 --- a/internal/service/register.go +++ b/internal/service/register.go @@ -29,8 +29,8 @@ import ( func RegisterAll(grpcServer *grpc.Server, rubyServer *rubyserver.Server) { gitalypb.RegisterBlobServiceServer(grpcServer, blob.NewServer(rubyServer)) gitalypb.RegisterCleanupServiceServer(grpcServer, cleanup.NewServer()) - gitalypb.RegisterCommitServiceServer(grpcServer, commit.NewServer(rubyServer)) - gitalypb.RegisterDiffServiceServer(grpcServer, diff.NewServer(rubyServer)) + gitalypb.RegisterCommitServiceServer(grpcServer, commit.NewServer()) + gitalypb.RegisterDiffServiceServer(grpcServer, diff.NewServer()) gitalypb.RegisterNamespaceServiceServer(grpcServer, namespace.NewServer()) gitalypb.RegisterOperationServiceServer(grpcServer, operations.NewServer(rubyServer)) gitalypb.RegisterRefServiceServer(grpcServer, ref.NewServer(rubyServer)) |