diff --git a/pkg/helm/client.go b/pkg/helm/client.go index ddb34658e..c77b61c0b 100644 --- a/pkg/helm/client.go +++ b/pkg/helm/client.go @@ -393,24 +393,29 @@ func (h *Client) logs(ctx context.Context, req *rls.GetReleaseLogsRequest, done } rlc := rls.NewReleaseServiceClient(c) - s, err := rlc.GetReleaseLogs(ctx, req) + s, err := rlc.GetReleaseLogs(ctx) + fmt.Println("Got s: ", s, " err: ", err) if err != nil { return nil, err } + s.Send(req) + fmt.Println("Sent req") + out := make(chan *rls.GetReleaseLogsResponse) go func() { defer close(out) defer c.Close() for { + fmt.Println("Waiting on recv") rs, err := s.Recv() + fmt.Println("Got rs: ", s, " err: ", err) if err == io.EOF { return } if err != nil { - fmt.Println("gRPC error streaming logs: ", grpc.ErrorDesc(err)) - return + fmt.Println() } out <- rs //select { diff --git a/pkg/proto/hapi/services/tiller.pb.go b/pkg/proto/hapi/services/tiller.pb.go index c718c98d1..817730f03 100644 --- a/pkg/proto/hapi/services/tiller.pb.go +++ b/pkg/proto/hapi/services/tiller.pb.go @@ -600,7 +600,7 @@ type ReleaseServiceClient interface { // GetReleaseContent retrieves the release content (chart + value) for the specified release. GetReleaseContent(ctx context.Context, in *GetReleaseContentRequest, opts ...grpc.CallOption) (*GetReleaseContentResponse, error) // GetReleaseLogs returns a stream of logging information from the release - GetReleaseLogs(ctx context.Context, in *GetReleaseLogsRequest, opts ...grpc.CallOption) (ReleaseService_GetReleaseLogsClient, error) + GetReleaseLogs(ctx context.Context, opts ...grpc.CallOption) (ReleaseService_GetReleaseLogsClient, error) // UpdateRelease updates release content. UpdateRelease(ctx context.Context, in *UpdateReleaseRequest, opts ...grpc.CallOption) (*UpdateReleaseResponse, error) // InstallRelease requests installation of a chart as a new release. @@ -675,22 +675,17 @@ func (c *releaseServiceClient) GetReleaseContent(ctx context.Context, in *GetRel return out, nil } -func (c *releaseServiceClient) GetReleaseLogs(ctx context.Context, in *GetReleaseLogsRequest, opts ...grpc.CallOption) (ReleaseService_GetReleaseLogsClient, error) { +func (c *releaseServiceClient) GetReleaseLogs(ctx context.Context, opts ...grpc.CallOption) (ReleaseService_GetReleaseLogsClient, error) { stream, err := grpc.NewClientStream(ctx, &_ReleaseService_serviceDesc.Streams[1], c.cc, "/hapi.services.tiller.ReleaseService/GetReleaseLogs", opts...) if err != nil { return nil, err } x := &releaseServiceGetReleaseLogsClient{stream} - if err := x.ClientStream.SendMsg(in); err != nil { - return nil, err - } - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } return x, nil } type ReleaseService_GetReleaseLogsClient interface { + Send(*GetReleaseLogsRequest) error Recv() (*GetReleaseLogsResponse, error) grpc.ClientStream } @@ -699,6 +694,10 @@ type releaseServiceGetReleaseLogsClient struct { grpc.ClientStream } +func (x *releaseServiceGetReleaseLogsClient) Send(m *GetReleaseLogsRequest) error { + return x.ClientStream.SendMsg(m) +} + func (x *releaseServiceGetReleaseLogsClient) Recv() (*GetReleaseLogsResponse, error) { m := new(GetReleaseLogsResponse) if err := x.ClientStream.RecvMsg(m); err != nil { @@ -806,7 +805,7 @@ type ReleaseServiceServer interface { // GetReleaseContent retrieves the release content (chart + value) for the specified release. GetReleaseContent(context.Context, *GetReleaseContentRequest) (*GetReleaseContentResponse, error) // GetReleaseLogs returns a stream of logging information from the release - GetReleaseLogs(*GetReleaseLogsRequest, ReleaseService_GetReleaseLogsServer) error + GetReleaseLogs(ReleaseService_GetReleaseLogsServer) error // UpdateRelease updates release content. UpdateRelease(context.Context, *UpdateReleaseRequest) (*UpdateReleaseResponse, error) // InstallRelease requests installation of a chart as a new release. @@ -885,15 +884,12 @@ func _ReleaseService_GetReleaseContent_Handler(srv interface{}, ctx context.Cont } func _ReleaseService_GetReleaseLogs_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(GetReleaseLogsRequest) - if err := stream.RecvMsg(m); err != nil { - return err - } - return srv.(ReleaseServiceServer).GetReleaseLogs(m, &releaseServiceGetReleaseLogsServer{stream}) + return srv.(ReleaseServiceServer).GetReleaseLogs(&releaseServiceGetReleaseLogsServer{stream}) } type ReleaseService_GetReleaseLogsServer interface { Send(*GetReleaseLogsResponse) error + Recv() (*GetReleaseLogsRequest, error) grpc.ServerStream } @@ -905,6 +901,14 @@ func (x *releaseServiceGetReleaseLogsServer) Send(m *GetReleaseLogsResponse) err return x.ServerStream.SendMsg(m) } +func (x *releaseServiceGetReleaseLogsServer) Recv() (*GetReleaseLogsRequest, error) { + m := new(GetReleaseLogsRequest) + if err := x.ServerStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + func _ReleaseService_UpdateRelease_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(UpdateReleaseRequest) if err := dec(in); err != nil { @@ -1081,6 +1085,7 @@ var _ReleaseService_serviceDesc = grpc.ServiceDesc{ StreamName: "GetReleaseLogs", Handler: _ReleaseService_GetReleaseLogs_Handler, ServerStreams: true, + ClientStreams: true, }, { StreamName: "RunReleaseTest", @@ -1094,82 +1099,83 @@ var _ReleaseService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("hapi/services/tiller.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1229 bytes of a gzipped FileDescriptorProto + // 1233 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xdd, 0x72, 0xdb, 0x44, - 0x14, 0x8e, 0x2c, 0xc7, 0x3f, 0x27, 0x69, 0x48, 0xb7, 0xf9, 0x51, 0x35, 0xc0, 0x04, 0x75, 0xa0, - 0x6e, 0x4b, 0x1d, 0x30, 0x57, 0xcc, 0x00, 0x33, 0x69, 0xea, 0x49, 0x0a, 0x26, 0x9d, 0x91, 0xdb, - 0x32, 0xc3, 0x30, 0x78, 0x14, 0x7b, 0xed, 0x88, 0xca, 0x5a, 0xa3, 0x5d, 0x85, 0xe6, 0x96, 0x3b, - 0x1e, 0x85, 0xb7, 0xe0, 0x01, 0x80, 0x67, 0x62, 0xb4, 0x3f, 0xb2, 0x56, 0x91, 0x12, 0xe1, 0x1b, - 0x6b, 0x77, 0xcf, 0xd9, 0xf3, 0xf3, 0x9d, 0x93, 0x6f, 0x4f, 0xc0, 0xbe, 0xf0, 0x16, 0xfe, 0x21, - 0xc5, 0xd1, 0xa5, 0x3f, 0xc6, 0xf4, 0x90, 0xf9, 0x41, 0x80, 0xa3, 0xee, 0x22, 0x22, 0x8c, 0xa0, - 0x9d, 0x44, 0xd6, 0x55, 0xb2, 0xae, 0x90, 0xd9, 0x7b, 0xfc, 0xc6, 0xf8, 0xc2, 0x8b, 0x98, 0xf8, - 0x15, 0xda, 0xf6, 0x7e, 0xf6, 0x9c, 0x84, 0x53, 0x7f, 0x26, 0x05, 0xc2, 0x45, 0x84, 0x03, 0xec, - 0x51, 0xac, 0xbe, 0x52, 0xb6, 0xa7, 0xc9, 0x02, 0x32, 0xd3, 0x8c, 0xa9, 0x73, 0x3f, 0x9c, 0x12, - 0x29, 0xb8, 0xaf, 0x09, 0x28, 0xf3, 0x58, 0x4c, 0x35, 0x3f, 0x97, 0x38, 0xa2, 0x3e, 0x09, 0xd5, - 0x57, 0xc8, 0x9c, 0xbf, 0x6a, 0x70, 0x6f, 0xe0, 0x53, 0xe6, 0x8a, 0x8b, 0xd4, 0xc5, 0xbf, 0xc6, - 0x98, 0x32, 0xb4, 0x03, 0xeb, 0x81, 0x3f, 0xf7, 0x99, 0x65, 0x1c, 0x18, 0x1d, 0xd3, 0x15, 0x1b, - 0xb4, 0x07, 0x0d, 0x32, 0x9d, 0x52, 0xcc, 0xac, 0xda, 0x81, 0xd1, 0x69, 0xbb, 0x72, 0x87, 0xbe, - 0x81, 0x26, 0x25, 0x11, 0x1b, 0x9d, 0x5f, 0x59, 0xe6, 0x81, 0xd1, 0xd9, 0xea, 0x7d, 0xdc, 0x2d, - 0x82, 0xa8, 0x9b, 0x78, 0x1a, 0x92, 0x88, 0x75, 0x93, 0x9f, 0x67, 0x57, 0x6e, 0x83, 0xf2, 0x6f, - 0x62, 0x77, 0xea, 0x07, 0x0c, 0x47, 0x56, 0x5d, 0xd8, 0x15, 0x3b, 0x74, 0x02, 0xc0, 0xed, 0x92, - 0x68, 0x82, 0x23, 0x6b, 0x9d, 0x9b, 0xee, 0x54, 0x30, 0xfd, 0x32, 0xd1, 0x77, 0xdb, 0x54, 0x2d, - 0xd1, 0x57, 0xb0, 0x29, 0x20, 0x19, 0x8d, 0xc9, 0x04, 0x53, 0xab, 0x71, 0x60, 0x76, 0xb6, 0x7a, - 0xf7, 0x85, 0x29, 0x85, 0xfc, 0x50, 0x80, 0x76, 0x4c, 0x26, 0xd8, 0xdd, 0x10, 0xea, 0xc9, 0x9a, - 0xa2, 0xf7, 0xa1, 0x1d, 0x7a, 0x73, 0x4c, 0x17, 0xde, 0x18, 0x5b, 0x4d, 0x1e, 0xe1, 0xf2, 0xc0, - 0xf9, 0x19, 0x5a, 0xca, 0xb9, 0xd3, 0x83, 0x86, 0x48, 0x0d, 0x6d, 0x40, 0xf3, 0xf5, 0xd9, 0x77, - 0x67, 0x2f, 0x7f, 0x38, 0xdb, 0x5e, 0x43, 0x2d, 0xa8, 0x9f, 0x1d, 0x7d, 0xdf, 0xdf, 0x36, 0xd0, - 0x5d, 0xb8, 0x33, 0x38, 0x1a, 0xbe, 0x1a, 0xb9, 0xfd, 0x41, 0xff, 0x68, 0xd8, 0x7f, 0xbe, 0x5d, - 0x73, 0x3e, 0x84, 0x76, 0x1a, 0x33, 0x6a, 0x82, 0x79, 0x34, 0x3c, 0x16, 0x57, 0x9e, 0xf7, 0x87, - 0xc7, 0xdb, 0x86, 0xf3, 0x87, 0x01, 0x3b, 0x7a, 0x89, 0xe8, 0x82, 0x84, 0x14, 0x27, 0x35, 0x1a, - 0x93, 0x38, 0x4c, 0x6b, 0xc4, 0x37, 0x08, 0x41, 0x3d, 0xc4, 0xef, 0x54, 0x85, 0xf8, 0x3a, 0xd1, - 0x64, 0x84, 0x79, 0x01, 0xaf, 0x8e, 0xe9, 0x8a, 0x0d, 0xfa, 0x1c, 0x5a, 0x32, 0x75, 0x6a, 0xd5, - 0x0f, 0xcc, 0xce, 0x46, 0x6f, 0x57, 0x07, 0x44, 0x7a, 0x74, 0x53, 0x35, 0xe7, 0x04, 0xf6, 0x4f, - 0xb0, 0x8a, 0x44, 0xe0, 0xa5, 0x3a, 0x26, 0xf1, 0xeb, 0xcd, 0x31, 0x0f, 0x26, 0xf1, 0xeb, 0xcd, - 0x31, 0xb2, 0xa0, 0x29, 0xdb, 0x8d, 0x87, 0xb3, 0xee, 0xaa, 0xad, 0xc3, 0xc0, 0xba, 0x6e, 0x48, - 0xe6, 0x55, 0x64, 0xe9, 0x13, 0xa8, 0x27, 0xcd, 0xce, 0xcd, 0x6c, 0xf4, 0x90, 0x1e, 0xe7, 0x8b, - 0x70, 0x4a, 0x5c, 0x2e, 0xd7, 0x4b, 0x65, 0xe6, 0x4b, 0x75, 0x9a, 0xf5, 0x7a, 0x4c, 0x42, 0x86, - 0x43, 0xb6, 0x5a, 0xfc, 0x03, 0xb8, 0x5f, 0x60, 0x49, 0x26, 0x70, 0x08, 0x4d, 0x19, 0x1a, 0xb7, - 0x56, 0x8a, 0xab, 0xd2, 0x72, 0xfa, 0xb0, 0xbb, 0xb4, 0x36, 0x20, 0xb3, 0x15, 0x41, 0xfd, 0x1a, - 0xf6, 0xf2, 0x66, 0x64, 0x44, 0x0f, 0xc0, 0x0c, 0xc8, 0x4c, 0x46, 0x73, 0x57, 0x8f, 0x66, 0x40, - 0x66, 0x6e, 0x22, 0x75, 0xfe, 0xa9, 0xc1, 0xce, 0xeb, 0xc5, 0xc4, 0x63, 0x58, 0x05, 0x78, 0x43, - 0x14, 0x0f, 0x61, 0x9d, 0x53, 0x9a, 0xac, 0x88, 0xb4, 0x29, 0x78, 0xef, 0x38, 0xf9, 0x75, 0x85, - 0x1c, 0x3d, 0x86, 0xc6, 0xa5, 0x17, 0xc4, 0x98, 0xf2, 0x72, 0xa4, 0xb5, 0x93, 0x9a, 0x9c, 0x0f, - 0x5d, 0xa9, 0x81, 0xf6, 0xa1, 0x39, 0x89, 0xae, 0x46, 0x51, 0x1c, 0x72, 0x22, 0x68, 0xb9, 0x8d, - 0x49, 0x74, 0xe5, 0xc6, 0x21, 0x7a, 0x00, 0x77, 0x26, 0x3e, 0xf5, 0xce, 0x03, 0x3c, 0xba, 0x20, - 0xe4, 0x2d, 0xe5, 0x5c, 0xd0, 0x72, 0x37, 0xe5, 0xe1, 0x69, 0x72, 0x86, 0xec, 0xa4, 0x9f, 0xc7, - 0x11, 0xf6, 0x18, 0xb6, 0x1a, 0x5c, 0x9e, 0xee, 0x13, 0xd0, 0x98, 0x3f, 0xc7, 0x24, 0x66, 0xfc, - 0x0f, 0xd8, 0x74, 0xd5, 0x16, 0x7d, 0x04, 0x9b, 0x11, 0xa6, 0x98, 0x8d, 0x64, 0x94, 0x2d, 0x7e, - 0x73, 0x83, 0x9f, 0xbd, 0x11, 0x61, 0x21, 0xa8, 0xff, 0xe6, 0xf9, 0xcc, 0x6a, 0x73, 0x11, 0x5f, - 0x8b, 0x6b, 0x31, 0xc5, 0xea, 0x1a, 0xa8, 0x6b, 0x31, 0xc5, 0xe2, 0x9a, 0x73, 0x0a, 0xbb, 0x39, - 0x38, 0x57, 0xed, 0x8f, 0x7f, 0x0d, 0xd8, 0x73, 0x49, 0x10, 0x9c, 0x7b, 0xe3, 0xb7, 0x15, 0x6a, - 0x93, 0x81, 0xb1, 0x76, 0x33, 0x8c, 0x66, 0x01, 0x8c, 0x99, 0xfe, 0xaa, 0x6b, 0xfd, 0xa5, 0x01, - 0xbc, 0x5e, 0x0e, 0x70, 0x43, 0x07, 0x58, 0xa1, 0xd7, 0x5c, 0xa2, 0xe7, 0x7c, 0x0b, 0xfb, 0xd7, - 0xf2, 0x59, 0x15, 0x9c, 0x3f, 0x6b, 0xb0, 0xfb, 0x22, 0xa4, 0xcc, 0x0b, 0x82, 0x1c, 0x36, 0x69, - 0x8f, 0x1a, 0x95, 0x7b, 0xb4, 0xf6, 0x7f, 0x7a, 0xd4, 0xd4, 0xc0, 0x55, 0x95, 0xa8, 0x67, 0x2a, - 0x51, 0xa9, 0x6f, 0x35, 0xce, 0x6a, 0xe4, 0x38, 0x0b, 0x7d, 0x00, 0x20, 0x1a, 0x8d, 0x1b, 0x17, - 0x20, 0xb6, 0xf9, 0xc9, 0x99, 0x64, 0x03, 0x85, 0x7b, 0xab, 0x18, 0xf7, 0x4c, 0xd7, 0x3a, 0x2f, - 0x60, 0x2f, 0x0f, 0xd5, 0xaa, 0xb0, 0xff, 0x6e, 0xc0, 0xfe, 0xeb, 0xd0, 0x2f, 0x04, 0xbe, 0xa8, - 0x29, 0xaf, 0x41, 0x51, 0x2b, 0x80, 0x62, 0x07, 0xd6, 0x17, 0x71, 0x34, 0xc3, 0x12, 0x5a, 0xb1, - 0xc9, 0xe6, 0x58, 0xd7, 0x72, 0x74, 0x46, 0x60, 0x5d, 0x8f, 0x61, 0xc5, 0x8c, 0x92, 0xa8, 0xd3, - 0x37, 0xa6, 0x2d, 0xde, 0x13, 0xe7, 0x1e, 0xdc, 0x3d, 0xc1, 0xec, 0x8d, 0xf8, 0x03, 0x90, 0xe9, - 0x39, 0x7d, 0x40, 0xd9, 0xc3, 0xa5, 0x3f, 0x79, 0xa4, 0xfb, 0x53, 0x03, 0x97, 0xd2, 0x4f, 0xe9, - 0xfa, 0x4b, 0x6e, 0xfb, 0xd4, 0xa7, 0x8c, 0x44, 0x57, 0x37, 0x41, 0xb7, 0x0d, 0xe6, 0xdc, 0x7b, - 0x27, 0xd9, 0x3e, 0x59, 0x3a, 0x27, 0x3c, 0x82, 0xf4, 0xaa, 0x8c, 0x20, 0xfb, 0xa0, 0x1b, 0xd5, - 0x1e, 0xf4, 0x9f, 0x00, 0xbd, 0xc2, 0xe9, 0x6c, 0x71, 0xcb, 0xb3, 0xa3, 0x8a, 0x50, 0xd3, 0x1b, - 0xcd, 0x82, 0xe6, 0x38, 0xc0, 0x5e, 0x18, 0x2f, 0x64, 0xd9, 0xd4, 0xd6, 0x79, 0x08, 0xf7, 0x34, - 0xeb, 0x32, 0xce, 0x24, 0x1f, 0x3a, 0x93, 0xd6, 0x93, 0x65, 0xef, 0xef, 0x36, 0x6c, 0xa9, 0x61, - 0x40, 0x0c, 0x76, 0xc8, 0x87, 0xcd, 0xec, 0xd4, 0x83, 0x1e, 0x95, 0xcf, 0x7d, 0xb9, 0xe1, 0xd5, - 0x7e, 0x5c, 0x45, 0x55, 0xc4, 0xe2, 0xac, 0x7d, 0x66, 0x20, 0x0a, 0xdb, 0xf9, 0x61, 0x04, 0x3d, - 0x2d, 0xb6, 0x51, 0x32, 0xfd, 0xd8, 0xdd, 0xaa, 0xea, 0xca, 0x2d, 0xba, 0xe4, 0xd5, 0xd7, 0x27, - 0x08, 0x74, 0xab, 0x19, 0x7d, 0x68, 0xb1, 0x0f, 0x2b, 0xeb, 0xa7, 0x7e, 0x09, 0x6c, 0xe9, 0x43, - 0x02, 0x7a, 0x72, 0x9b, 0x91, 0xcc, 0x44, 0x62, 0x7f, 0x5a, 0x4d, 0x39, 0x83, 0xee, 0x2f, 0x70, - 0x47, 0x7b, 0x06, 0x51, 0x49, 0x79, 0x8a, 0x46, 0x0f, 0xfb, 0x49, 0x25, 0xdd, 0x34, 0xb9, 0x39, - 0x6c, 0xe9, 0xfc, 0x56, 0x96, 0x5c, 0xe1, 0x83, 0x51, 0x96, 0x5c, 0x31, 0x65, 0x3a, 0x6b, 0x49, - 0xe3, 0xe4, 0xe9, 0xa7, 0xac, 0x71, 0x4a, 0xa8, 0xb2, 0xac, 0x71, 0xca, 0x58, 0xcd, 0x59, 0x43, - 0x1e, 0xc0, 0x92, 0x7d, 0xd0, 0xc3, 0xd2, 0x7a, 0xe8, 0xa4, 0x65, 0x77, 0x6e, 0x57, 0x4c, 0x5d, - 0x2c, 0xe0, 0xbd, 0xdc, 0xf3, 0x8c, 0x4a, 0xa0, 0x29, 0x9e, 0x4a, 0xec, 0xa7, 0x15, 0xb5, 0x73, - 0x49, 0x49, 0x42, 0xbb, 0x21, 0x29, 0x9d, 0x2d, 0x6f, 0x48, 0x2a, 0xc7, 0x8d, 0xce, 0x1a, 0xf2, - 0x61, 0xcb, 0x8d, 0x43, 0xe9, 0x3a, 0xa1, 0x25, 0x54, 0x72, 0xfb, 0x3a, 0x21, 0xda, 0x8f, 0x2a, - 0x68, 0x2e, 0x5b, 0xfe, 0x19, 0xfc, 0xd8, 0x52, 0xaa, 0xe7, 0x0d, 0xfe, 0x8f, 0xf6, 0x17, 0xff, - 0x05, 0x00, 0x00, 0xff, 0xff, 0x60, 0x54, 0x63, 0x84, 0x51, 0x10, 0x00, 0x00, + 0x14, 0x8e, 0x2c, 0xc7, 0x3f, 0x27, 0x69, 0x70, 0xb7, 0x89, 0xa3, 0x6a, 0x80, 0x09, 0xea, 0x40, + 0xdd, 0x96, 0x3a, 0xc5, 0x5c, 0x31, 0x03, 0xcc, 0xa4, 0xa9, 0x27, 0x29, 0x98, 0x74, 0x46, 0x6e, + 0xcb, 0x0c, 0xc3, 0xe0, 0x51, 0xec, 0xb5, 0x2b, 0x2a, 0x6b, 0x5d, 0xed, 0x2a, 0x34, 0xb7, 0xdc, + 0xf1, 0x28, 0xbc, 0x05, 0x2f, 0x40, 0x9f, 0x89, 0xd1, 0xfe, 0xc8, 0x5e, 0x45, 0x4a, 0x84, 0x6f, + 0xac, 0xdd, 0x3d, 0x67, 0xcf, 0xcf, 0x77, 0x4e, 0xbe, 0x3d, 0x01, 0xfb, 0x8d, 0xb7, 0xf0, 0x0f, + 0x29, 0x8e, 0x2e, 0xfc, 0x31, 0xa6, 0x87, 0xcc, 0x0f, 0x02, 0x1c, 0x75, 0x17, 0x11, 0x61, 0x04, + 0xed, 0x26, 0xb2, 0xae, 0x92, 0x75, 0x85, 0xcc, 0x6e, 0xf3, 0x1b, 0xe3, 0x37, 0x5e, 0xc4, 0xc4, + 0xaf, 0xd0, 0xb6, 0xf7, 0x57, 0xcf, 0x49, 0x38, 0xf5, 0x67, 0x52, 0x20, 0x5c, 0x44, 0x38, 0xc0, + 0x1e, 0xc5, 0xea, 0x2b, 0x65, 0x6d, 0x4d, 0x16, 0x90, 0x99, 0x66, 0x4c, 0x9d, 0xfb, 0xe1, 0x94, + 0x48, 0xc1, 0x5d, 0x4d, 0x40, 0x99, 0xc7, 0x62, 0xaa, 0xf9, 0xb9, 0xc0, 0x11, 0xf5, 0x49, 0xa8, + 0xbe, 0x42, 0xe6, 0xfc, 0x53, 0x81, 0x3b, 0x03, 0x9f, 0x32, 0x57, 0x5c, 0xa4, 0x2e, 0x7e, 0x17, + 0x63, 0xca, 0xd0, 0x2e, 0x6c, 0x06, 0xfe, 0xdc, 0x67, 0x96, 0x71, 0x60, 0x74, 0x4c, 0x57, 0x6c, + 0x50, 0x1b, 0x6a, 0x64, 0x3a, 0xa5, 0x98, 0x59, 0x95, 0x03, 0xa3, 0xd3, 0x74, 0xe5, 0x0e, 0x7d, + 0x0f, 0x75, 0x4a, 0x22, 0x36, 0x3a, 0xbf, 0xb4, 0xcc, 0x03, 0xa3, 0xb3, 0xd3, 0xfb, 0xbc, 0x9b, + 0x07, 0x51, 0x37, 0xf1, 0x34, 0x24, 0x11, 0xeb, 0x26, 0x3f, 0x4f, 0x2f, 0xdd, 0x1a, 0xe5, 0xdf, + 0xc4, 0xee, 0xd4, 0x0f, 0x18, 0x8e, 0xac, 0xaa, 0xb0, 0x2b, 0x76, 0xe8, 0x04, 0x80, 0xdb, 0x25, + 0xd1, 0x04, 0x47, 0xd6, 0x26, 0x37, 0xdd, 0x29, 0x61, 0xfa, 0x45, 0xa2, 0xef, 0x36, 0xa9, 0x5a, + 0xa2, 0x6f, 0x61, 0x5b, 0x40, 0x32, 0x1a, 0x93, 0x09, 0xa6, 0x56, 0xed, 0xc0, 0xec, 0xec, 0xf4, + 0xee, 0x0a, 0x53, 0x0a, 0xf9, 0xa1, 0x00, 0xed, 0x98, 0x4c, 0xb0, 0xbb, 0x25, 0xd4, 0x93, 0x35, + 0x45, 0x1f, 0x43, 0x33, 0xf4, 0xe6, 0x98, 0x2e, 0xbc, 0x31, 0xb6, 0xea, 0x3c, 0xc2, 0xe5, 0x81, + 0xf3, 0x1b, 0x34, 0x94, 0x73, 0xa7, 0x07, 0x35, 0x91, 0x1a, 0xda, 0x82, 0xfa, 0xab, 0xb3, 0x1f, + 0xcf, 0x5e, 0xfc, 0x7c, 0xd6, 0xda, 0x40, 0x0d, 0xa8, 0x9e, 0x1d, 0xfd, 0xd4, 0x6f, 0x19, 0xe8, + 0x36, 0xdc, 0x1a, 0x1c, 0x0d, 0x5f, 0x8e, 0xdc, 0xfe, 0xa0, 0x7f, 0x34, 0xec, 0x3f, 0x6b, 0x55, + 0x9c, 0x4f, 0xa1, 0x99, 0xc6, 0x8c, 0xea, 0x60, 0x1e, 0x0d, 0x8f, 0xc5, 0x95, 0x67, 0xfd, 0xe1, + 0x71, 0xcb, 0x70, 0xfe, 0x32, 0x60, 0x57, 0x2f, 0x11, 0x5d, 0x90, 0x90, 0xe2, 0xa4, 0x46, 0x63, + 0x12, 0x87, 0x69, 0x8d, 0xf8, 0x06, 0x21, 0xa8, 0x86, 0xf8, 0xbd, 0xaa, 0x10, 0x5f, 0x27, 0x9a, + 0x8c, 0x30, 0x2f, 0xe0, 0xd5, 0x31, 0x5d, 0xb1, 0x41, 0x5f, 0x41, 0x43, 0xa6, 0x4e, 0xad, 0xea, + 0x81, 0xd9, 0xd9, 0xea, 0xed, 0xe9, 0x80, 0x48, 0x8f, 0x6e, 0xaa, 0xe6, 0x9c, 0xc0, 0xfe, 0x09, + 0x56, 0x91, 0x08, 0xbc, 0x54, 0xc7, 0x24, 0x7e, 0xbd, 0x39, 0xe6, 0xc1, 0x24, 0x7e, 0xbd, 0x39, + 0x46, 0x16, 0xd4, 0x65, 0xbb, 0xf1, 0x70, 0x36, 0x5d, 0xb5, 0x75, 0x18, 0x58, 0x57, 0x0d, 0xc9, + 0xbc, 0xf2, 0x2c, 0x7d, 0x01, 0xd5, 0xa4, 0xd9, 0xb9, 0x99, 0xad, 0x1e, 0xd2, 0xe3, 0x7c, 0x1e, + 0x4e, 0x89, 0xcb, 0xe5, 0x7a, 0xa9, 0xcc, 0x6c, 0xa9, 0x4e, 0x57, 0xbd, 0x1e, 0x93, 0x90, 0xe1, + 0x90, 0xad, 0x17, 0xff, 0x00, 0xee, 0xe6, 0x58, 0x92, 0x09, 0x1c, 0x42, 0x5d, 0x86, 0xc6, 0xad, + 0x15, 0xe2, 0xaa, 0xb4, 0x9c, 0x3e, 0xec, 0x2d, 0xad, 0x0d, 0xc8, 0x6c, 0x4d, 0x50, 0xbf, 0x83, + 0x76, 0xd6, 0x8c, 0x8c, 0xe8, 0x1e, 0x98, 0x01, 0x99, 0xc9, 0x68, 0x6e, 0xeb, 0xd1, 0x0c, 0xc8, + 0xcc, 0x4d, 0xa4, 0xce, 0xbf, 0x15, 0xd8, 0x7d, 0xb5, 0x98, 0x78, 0x0c, 0xab, 0x00, 0xaf, 0x89, + 0xe2, 0x3e, 0x6c, 0x72, 0x4a, 0x93, 0x15, 0x91, 0x36, 0x05, 0xef, 0x1d, 0x27, 0xbf, 0xae, 0x90, + 0xa3, 0x87, 0x50, 0xbb, 0xf0, 0x82, 0x18, 0x53, 0x5e, 0x8e, 0xb4, 0x76, 0x52, 0x93, 0xf3, 0xa1, + 0x2b, 0x35, 0xd0, 0x3e, 0xd4, 0x27, 0xd1, 0xe5, 0x28, 0x8a, 0x43, 0x4e, 0x04, 0x0d, 0xb7, 0x36, + 0x89, 0x2e, 0xdd, 0x38, 0x44, 0xf7, 0xe0, 0xd6, 0xc4, 0xa7, 0xde, 0x79, 0x80, 0x47, 0x6f, 0x08, + 0x79, 0x4b, 0x39, 0x17, 0x34, 0xdc, 0x6d, 0x79, 0x78, 0x9a, 0x9c, 0x21, 0x3b, 0xe9, 0xe7, 0x71, + 0x84, 0x3d, 0x86, 0xad, 0x1a, 0x97, 0xa7, 0xfb, 0x04, 0x34, 0xe6, 0xcf, 0x31, 0x89, 0x19, 0xff, + 0x03, 0x36, 0x5d, 0xb5, 0x45, 0x9f, 0xc1, 0x76, 0x84, 0x29, 0x66, 0x23, 0x19, 0x65, 0x83, 0xdf, + 0xdc, 0xe2, 0x67, 0xaf, 0x45, 0x58, 0x08, 0xaa, 0x7f, 0x78, 0x3e, 0xb3, 0x9a, 0x5c, 0xc4, 0xd7, + 0xe2, 0x5a, 0x4c, 0xb1, 0xba, 0x06, 0xea, 0x5a, 0x4c, 0xb1, 0xb8, 0xe6, 0x9c, 0xc2, 0x5e, 0x06, + 0xce, 0x75, 0xfb, 0xe3, 0x83, 0x01, 0x6d, 0x97, 0x04, 0xc1, 0xb9, 0x37, 0x7e, 0x5b, 0xa2, 0x36, + 0x2b, 0x30, 0x56, 0xae, 0x87, 0xd1, 0xcc, 0x81, 0x71, 0xa5, 0xbf, 0xaa, 0x5a, 0x7f, 0x69, 0x00, + 0x6f, 0x16, 0x03, 0x5c, 0xd3, 0x01, 0x56, 0xe8, 0xd5, 0x97, 0xe8, 0x39, 0x3f, 0xc0, 0xfe, 0x95, + 0x7c, 0xd6, 0x05, 0xe7, 0xef, 0x0a, 0xec, 0x3d, 0x0f, 0x29, 0xf3, 0x82, 0x20, 0x83, 0x4d, 0xda, + 0xa3, 0x46, 0xe9, 0x1e, 0xad, 0xfc, 0x9f, 0x1e, 0x35, 0x35, 0x70, 0x55, 0x25, 0xaa, 0x2b, 0x95, + 0x28, 0xd5, 0xb7, 0x1a, 0x67, 0xd5, 0x32, 0x9c, 0x85, 0x3e, 0x01, 0x10, 0x8d, 0xc6, 0x8d, 0x0b, + 0x10, 0x9b, 0xfc, 0xe4, 0x4c, 0xb2, 0x81, 0xc2, 0xbd, 0x91, 0x8f, 0xfb, 0x4a, 0xd7, 0x3a, 0xcf, + 0xa1, 0x9d, 0x85, 0x6a, 0x5d, 0xd8, 0xff, 0x34, 0x60, 0xff, 0x55, 0xe8, 0xe7, 0x02, 0x9f, 0xd7, + 0x94, 0x57, 0xa0, 0xa8, 0xe4, 0x40, 0xb1, 0x0b, 0x9b, 0x8b, 0x38, 0x9a, 0x61, 0x09, 0xad, 0xd8, + 0xac, 0xe6, 0x58, 0xd5, 0x72, 0x74, 0x46, 0x60, 0x5d, 0x8d, 0x61, 0xcd, 0x8c, 0x92, 0xa8, 0xd3, + 0x37, 0xa6, 0x29, 0xde, 0x13, 0xe7, 0x0e, 0xdc, 0x3e, 0xc1, 0xec, 0xb5, 0xf8, 0x03, 0x90, 0xe9, + 0x39, 0x7d, 0x40, 0xab, 0x87, 0x4b, 0x7f, 0xf2, 0x48, 0xf7, 0xa7, 0x06, 0x2e, 0xa5, 0x9f, 0xd2, + 0xf5, 0x37, 0xdc, 0xf6, 0xa9, 0x4f, 0x19, 0x89, 0x2e, 0xaf, 0x83, 0xae, 0x05, 0xe6, 0xdc, 0x7b, + 0x2f, 0xd9, 0x3e, 0x59, 0x3a, 0x27, 0x3c, 0x82, 0xf4, 0xaa, 0x8c, 0x60, 0xf5, 0x41, 0x37, 0xca, + 0x3d, 0xe8, 0xbf, 0x02, 0x7a, 0x89, 0xd3, 0xd9, 0xe2, 0x86, 0x67, 0x47, 0x15, 0xa1, 0xa2, 0x37, + 0x9a, 0x05, 0xf5, 0x71, 0x80, 0xbd, 0x30, 0x5e, 0xc8, 0xb2, 0xa9, 0xad, 0x73, 0x1f, 0xee, 0x68, + 0xd6, 0x65, 0x9c, 0x49, 0x3e, 0x74, 0x26, 0xad, 0x27, 0xcb, 0xde, 0x87, 0x26, 0xec, 0xa8, 0x61, + 0x40, 0x0c, 0x76, 0xc8, 0x87, 0xed, 0xd5, 0xa9, 0x07, 0x3d, 0x28, 0x9e, 0xfb, 0x32, 0xc3, 0xab, + 0xfd, 0xb0, 0x8c, 0xaa, 0x88, 0xc5, 0xd9, 0x78, 0x62, 0x20, 0x0a, 0xad, 0xec, 0x30, 0x82, 0x1e, + 0xe7, 0xdb, 0x28, 0x98, 0x7e, 0xec, 0x6e, 0x59, 0x75, 0xe5, 0x16, 0x5d, 0xf0, 0xea, 0xeb, 0x13, + 0x04, 0xba, 0xd1, 0x8c, 0x3e, 0xb4, 0xd8, 0x87, 0xa5, 0xf5, 0x53, 0xbf, 0xef, 0x60, 0x47, 0x1f, + 0x12, 0xd0, 0xa3, 0x9b, 0x8c, 0xac, 0x4c, 0x24, 0xf6, 0x97, 0xe5, 0x94, 0x95, 0xbb, 0x8e, 0xf1, + 0xc4, 0x40, 0xbf, 0xc3, 0x2d, 0xed, 0x21, 0x44, 0x05, 0x05, 0xca, 0x1b, 0x3e, 0xec, 0x47, 0xa5, + 0x74, 0xd3, 0xf4, 0xe6, 0xb0, 0xa3, 0x33, 0x5c, 0x51, 0x7a, 0xb9, 0x4f, 0x46, 0x51, 0x7a, 0xf9, + 0xa4, 0xe9, 0x6c, 0x24, 0xad, 0x93, 0x25, 0xa0, 0xa2, 0xd6, 0x29, 0x20, 0xcb, 0xa2, 0xd6, 0x29, + 0xe2, 0x35, 0x67, 0x03, 0x79, 0x00, 0x4b, 0xfe, 0x41, 0xf7, 0x0b, 0x2b, 0xa2, 0xd3, 0x96, 0xdd, + 0xb9, 0x59, 0x31, 0x75, 0xb1, 0x80, 0x8f, 0x32, 0x0f, 0x34, 0x2a, 0x80, 0x26, 0x7f, 0x2e, 0xb1, + 0x1f, 0x97, 0xd4, 0xce, 0x24, 0x25, 0x29, 0xed, 0x9a, 0xa4, 0x74, 0xbe, 0xbc, 0x26, 0xa9, 0x0c, + 0x3b, 0x3a, 0x1b, 0xc8, 0x87, 0x1d, 0x37, 0x0e, 0xa5, 0xeb, 0x84, 0x98, 0x50, 0xc1, 0xed, 0xab, + 0x94, 0x68, 0x3f, 0x28, 0xa1, 0xb9, 0xa4, 0x94, 0xa7, 0xf0, 0x4b, 0x43, 0xa9, 0x9e, 0xd7, 0xf8, + 0xbf, 0xda, 0x5f, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x78, 0x8f, 0xed, 0x5d, 0x53, 0x10, 0x00, + 0x00, } diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go index c122086b9..46f0bf480 100644 --- a/pkg/tiller/release_server.go +++ b/pkg/tiller/release_server.go @@ -285,20 +285,32 @@ func (s *ReleaseServer) GetReleaseContent(c ctx.Context, req *services.GetReleas return &services.GetReleaseContentResponse{Release: rel}, err } -func (s *ReleaseServer) GetReleaseLogs(req *services.GetReleaseLogsRequest, stream services.ReleaseService_GetReleaseLogsServer) error { +func (s *ReleaseServer) GetReleaseLogs(svc services.ReleaseService_GetReleaseLogsServer) error { t := time.NewTicker(time.Second) - //go func() { + done := make(chan struct{}) + go func() { + for { + select { + case <-t.C: + fmt.Println("Sending a log") + svc.Send(&services.GetReleaseLogsResponse{Log: &release.Log{Log: "Test log!"}}) + case <-done: + return + } + } + }() + for { - select { - case <-t.C: - fmt.Println("Sending a log") - stream.Send(&services.GetReleaseLogsResponse{Log: &release.Log{Log: "Test log!"}}) + rq, err := svc.Recv() + fmt.Println("Req: ", rq, " Error: ", err) + if err != nil { + done <- struct{}{} + break } + s.logs.Subscribe(rq.Name, ) + rq.Name } - //}() - fmt.Println("Out of the for loop") - stream.Send(&services.GetReleaseLogsResponse{Log: &release.Log{Log: "Starting to stream logs!"}}) return nil }