From 0120690d353f4e347266f47255d3da5b4fd48ff8 Mon Sep 17 00:00:00 2001 From: ko_oler <kooler89@gmail.com> Date: Wed, 24 Jan 2024 17:19:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BE=D0=BA=20=D0=B2=20proto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- perxis-proto | 2 +- proto/log/log_service_grpc.pb.go | 106 +++++-------------------------- 2 files changed, 17 insertions(+), 91 deletions(-) diff --git a/perxis-proto b/perxis-proto index 163bb2f7..278090be 160000 --- a/perxis-proto +++ b/perxis-proto @@ -1 +1 @@ -Subproject commit 163bb2f7aa062be5a7ded222f461ff2f29293a32 +Subproject commit 278090bee7e909bde34c9e35cf1cbee307a33eee diff --git a/proto/log/log_service_grpc.pb.go b/proto/log/log_service_grpc.pb.go index 449edb01..d9dfda0b 100644 --- a/proto/log/log_service_grpc.pb.go +++ b/proto/log/log_service_grpc.pb.go @@ -19,10 +19,9 @@ import ( const _ = grpc.SupportPackageIsVersion7 const ( - LogService_Log_FullMethodName = "/log.LogService/Log" - LogService_LogEntry_FullMethodName = "/log.LogService/LogEntry" - LogService_Find_FullMethodName = "/log.LogService/Find" - LogService_Delete_FullMethodName = "/log.LogService/Delete" + LogService_Log_FullMethodName = "/log.LogService/Log" + LogService_Find_FullMethodName = "/log.LogService/Find" + LogService_Delete_FullMethodName = "/log.LogService/Delete" ) // LogServiceClient is the client API for LogService service. @@ -30,9 +29,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type LogServiceClient interface { // Метод для записи логов - Log(ctx context.Context, opts ...grpc.CallOption) (LogService_LogClient, error) - // Метод для записи одного лога - LogEntry(ctx context.Context, in *LogRequest, opts ...grpc.CallOption) (*LogResponse, error) + Log(ctx context.Context, in *LogRequest, opts ...grpc.CallOption) (*LogResponse, error) // Метод для поиска логов по заданным параметрам Find(ctx context.Context, in *FindRequest, opts ...grpc.CallOption) (*FindResponse, error) // Метод для удаления логов по заданным параметрам @@ -47,43 +44,9 @@ func NewLogServiceClient(cc grpc.ClientConnInterface) LogServiceClient { return &logServiceClient{cc} } -func (c *logServiceClient) Log(ctx context.Context, opts ...grpc.CallOption) (LogService_LogClient, error) { - stream, err := c.cc.NewStream(ctx, &LogService_ServiceDesc.Streams[0], LogService_Log_FullMethodName, opts...) - if err != nil { - return nil, err - } - x := &logServiceLogClient{stream} - return x, nil -} - -type LogService_LogClient interface { - Send(*LogRequest) error - CloseAndRecv() (*LogResponse, error) - grpc.ClientStream -} - -type logServiceLogClient struct { - grpc.ClientStream -} - -func (x *logServiceLogClient) Send(m *LogRequest) error { - return x.ClientStream.SendMsg(m) -} - -func (x *logServiceLogClient) CloseAndRecv() (*LogResponse, error) { - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } - m := new(LogResponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func (c *logServiceClient) LogEntry(ctx context.Context, in *LogRequest, opts ...grpc.CallOption) (*LogResponse, error) { +func (c *logServiceClient) Log(ctx context.Context, in *LogRequest, opts ...grpc.CallOption) (*LogResponse, error) { out := new(LogResponse) - err := c.cc.Invoke(ctx, LogService_LogEntry_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, LogService_Log_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -113,9 +76,7 @@ func (c *logServiceClient) Delete(ctx context.Context, in *DeleteRequest, opts . // for forward compatibility type LogServiceServer interface { // Метод для записи логов - Log(LogService_LogServer) error - // Метод для записи одного лога - LogEntry(context.Context, *LogRequest) (*LogResponse, error) + Log(context.Context, *LogRequest) (*LogResponse, error) // Метод для поиска логов по заданным параметрам Find(context.Context, *FindRequest) (*FindResponse, error) // Метод для удаления логов по заданным параметрам @@ -127,11 +88,8 @@ type LogServiceServer interface { type UnimplementedLogServiceServer struct { } -func (UnimplementedLogServiceServer) Log(LogService_LogServer) error { - return status.Errorf(codes.Unimplemented, "method Log not implemented") -} -func (UnimplementedLogServiceServer) LogEntry(context.Context, *LogRequest) (*LogResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method LogEntry not implemented") +func (UnimplementedLogServiceServer) Log(context.Context, *LogRequest) (*LogResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Log not implemented") } func (UnimplementedLogServiceServer) Find(context.Context, *FindRequest) (*FindResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Find not implemented") @@ -152,46 +110,20 @@ func RegisterLogServiceServer(s grpc.ServiceRegistrar, srv LogServiceServer) { s.RegisterService(&LogService_ServiceDesc, srv) } -func _LogService_Log_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(LogServiceServer).Log(&logServiceLogServer{stream}) -} - -type LogService_LogServer interface { - SendAndClose(*LogResponse) error - Recv() (*LogRequest, error) - grpc.ServerStream -} - -type logServiceLogServer struct { - grpc.ServerStream -} - -func (x *logServiceLogServer) SendAndClose(m *LogResponse) error { - return x.ServerStream.SendMsg(m) -} - -func (x *logServiceLogServer) Recv() (*LogRequest, error) { - m := new(LogRequest) - if err := x.ServerStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func _LogService_LogEntry_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _LogService_Log_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(LogRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(LogServiceServer).LogEntry(ctx, in) + return srv.(LogServiceServer).Log(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: LogService_LogEntry_FullMethodName, + FullMethod: LogService_Log_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LogServiceServer).LogEntry(ctx, req.(*LogRequest)) + return srv.(LogServiceServer).Log(ctx, req.(*LogRequest)) } return interceptor(ctx, in, info, handler) } @@ -240,8 +172,8 @@ var LogService_ServiceDesc = grpc.ServiceDesc{ HandlerType: (*LogServiceServer)(nil), Methods: []grpc.MethodDesc{ { - MethodName: "LogEntry", - Handler: _LogService_LogEntry_Handler, + MethodName: "Log", + Handler: _LogService_Log_Handler, }, { MethodName: "Find", @@ -252,12 +184,6 @@ var LogService_ServiceDesc = grpc.ServiceDesc{ Handler: _LogService_Delete_Handler, }, }, - Streams: []grpc.StreamDesc{ - { - StreamName: "Log", - Handler: _LogService_Log_Handler, - ClientStreams: true, - }, - }, + Streams: []grpc.StreamDesc{}, Metadata: "log/log_service.proto", } -- GitLab