From bfcee37aafc193115e80494638ccfe8282116cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Thu, 30 Nov 2017 23:45:58 -0300 Subject: Incorporate ConflictsService --- internal/rubyserver/rubyserver.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'internal/rubyserver') diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go index 821529efa..4970185b3 100644 --- a/internal/rubyserver/rubyserver.go +++ b/internal/rubyserver/rubyserver.go @@ -178,6 +178,14 @@ func (s *Server) WikiServiceClient(ctx context.Context) (pb.WikiServiceClient, e return pb.NewWikiServiceClient(conn), err } +// ConflictsServiceClient returns a ConflictsServiceClient instance that is +// configured to connect to the running Ruby server. This assumes Start() +// has been called already. +func (s *Server) ConflictsServiceClient(ctx context.Context) (pb.ConflictsServiceClient, error) { + conn, err := s.getConnection(ctx) + return pb.NewConflictsServiceClient(conn), err +} + func (s *Server) getConnection(ctx context.Context) (*grpc.ClientConn, error) { s.clientConnMu.RLock() conn := s.clientConn -- cgit v1.2.3