diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2017-12-01 05:45:58 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2017-12-08 20:12:17 +0300 |
| commit | bfcee37aafc193115e80494638ccfe8282116cf5 (patch) | |
| tree | 66276e7d08770e9a3bc4ed1542158ccf98b02ec3 /internal/rubyserver | |
| parent | 65b734907e6a17515d57705b57b5b3a65efc4944 (diff) | |
Incorporate ConflictsService
Diffstat (limited to 'internal/rubyserver')
| -rw-r--r-- | internal/rubyserver/rubyserver.go | 8 |
1 files changed, 8 insertions, 0 deletions
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 |