little-cui closed pull request #338: SCB-541 Fix the typo in response of schemas api URL: https://github.com/apache/incubator-servicecomb-service-center/pull/338
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/pkg/grace/grace.go b/pkg/grace/grace.go index 3ec7cd35..e53c6d44 100644 --- a/pkg/grace/grace.go +++ b/pkg/grace/grace.go @@ -20,7 +20,6 @@ import ( "flag" "fmt" "github.com/apache/incubator-servicecomb-service-center/pkg/util" - "golang.org/x/net/context" "os" "os/exec" "os/signal" @@ -72,7 +71,7 @@ func Init() { flag.Parse() } - util.Go(handleSignals) + go handleSignals() } func Before(f func()) { @@ -112,7 +111,7 @@ func fireSignalHook(ppFlag int, sig os.Signal) { } } -func handleSignals(ctx context.Context) { +func handleSignals() { var sig os.Signal sigCh := make(chan os.Signal) @@ -120,8 +119,6 @@ func handleSignals(ctx context.Context) { for { select { - case <-ctx.Done(): - return case sig = <-sigCh: fireSignalHook(PreSignal, sig) switch sig { diff --git a/server/core/proto/README.md b/server/core/proto/README.md index c626b018..928649b6 100644 --- a/server/core/proto/README.md +++ b/server/core/proto/README.md @@ -1,4 +1,5 @@ # service-center support for grpc 1. Download 'protoc' compiler, https://github.com/google/protobuf/releases -1. Install the go-grpc plugin, go get -u github.com/golang/protobuf/protoc-gen-go +1. git clone -b v1.0.0 https://github.com/golang/protobuf $GOPATH/src/github.com/golang/protobuf +1. Install the go-grpc plugin, go get github.com/golang/protobuf/protoc-gen-go 1. Compile the service.proto file, protoc --go_out=plugins=grpc:. services.proto \ No newline at end of file diff --git a/server/core/proto/services.pb.go b/server/core/proto/services.pb.go index 4fa36d30..32633242 100644 --- a/server/core/proto/services.pb.go +++ b/server/core/proto/services.pb.go @@ -1,18 +1,3 @@ -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed //under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - // Code generated by protoc-gen-go. DO NOT EDIT. // source: services.proto @@ -2269,7 +2254,7 @@ func (m *GetSchemaResponse) GetSchemaSummary() string { type GetAllSchemaResponse struct { Response *Response `protobuf:"bytes,1,opt,name=response" json:"response,omitempty"` - Schema []*Schema `protobuf:"bytes,2,rep,name=schema" json:"schema,omitempty"` + Schemas []*Schema `protobuf:"bytes,2,rep,name=schemas" json:"schemas,omitempty"` } func (m *GetAllSchemaResponse) Reset() { *m = GetAllSchemaResponse{} } @@ -2284,9 +2269,9 @@ func (m *GetAllSchemaResponse) GetResponse() *Response { return nil } -func (m *GetAllSchemaResponse) GetSchema() []*Schema { +func (m *GetAllSchemaResponse) GetSchemas() []*Schema { if m != nil { - return m.Schema + return m.Schemas } return nil } @@ -4233,220 +4218,220 @@ var _GovernServiceCtrl_serviceDesc = grpc.ServiceDesc{ func init() { proto1.RegisterFile("services.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 3437 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5c, 0xcf, 0x6f, 0x24, 0x47, - 0xf5, 0x57, 0x8d, 0x67, 0x3c, 0x9e, 0x37, 0xb6, 0x77, 0x5d, 0x6b, 0xaf, 0x7b, 0x27, 0xf9, 0xe6, - 0xbb, 0x6a, 0x45, 0x22, 0x87, 0xc8, 0x24, 0x0e, 0x49, 0x96, 0xcd, 0x6e, 0x36, 0xfe, 0xb1, 0xf1, - 0x7a, 0x93, 0xcd, 0x6e, 0x7a, 0x9c, 0x5d, 0x92, 0x00, 0x51, 0x7b, 0xa6, 0x3c, 0xd3, 0xd9, 0x99, - 0xee, 0x4e, 0x77, 0x8f, 0x37, 0x23, 0x21, 0xa1, 0x44, 0x09, 0x04, 0x02, 0x09, 0x11, 0x70, 0xca, - 0x01, 0x04, 0xe4, 0x08, 0x12, 0x08, 0x29, 0x42, 0x11, 0x08, 0x81, 0xb8, 0x25, 0x47, 0xc4, 0x09, - 0xee, 0x48, 0xdc, 0xf8, 0x03, 0x40, 0xf5, 0xa3, 0xbb, 0xab, 0x7f, 0xd8, 0x9e, 0xee, 0x76, 0x6f, - 0xc4, 0xc9, 0x5d, 0xd5, 0x53, 0xaf, 0xde, 0xab, 0xf7, 0xa3, 0x5e, 0x7d, 0xea, 0xb9, 0x61, 0xde, - 0x25, 0xce, 0xbe, 0xd1, 0x21, 0xee, 0x8a, 0xed, 0x58, 0x9e, 0x85, 0xbf, 0xd0, 0xb1, 0x86, 0x2b, - 0xfd, 0x91, 0x7e, 0x87, 0x18, 0x2b, 0xb6, 0xae, 0xbb, 0x2b, 0x1d, 0x97, 0xac, 0x88, 0xdf, 0x38, - 0xa4, 0x67, 0xb8, 0x9e, 0x33, 0x5e, 0xd1, 0x6d, 0x43, 0xfd, 0x26, 0x2c, 0x5e, 0xb3, 0xba, 0xc6, - 0xde, 0xb8, 0xdd, 0xe9, 0x93, 0xa1, 0xee, 0x6a, 0xe4, 0xb5, 0x11, 0x71, 0x3d, 0x7c, 0x2f, 0x34, - 0xc4, 0xcf, 0xb7, 0xbb, 0x0a, 0x3a, 0x8b, 0x1e, 0x68, 0x68, 0x61, 0x07, 0xde, 0x86, 0xba, 0xcb, - 0x7f, 0xaf, 0x54, 0xce, 0x4e, 0x3d, 0xd0, 0x5c, 0xfd, 0xe2, 0xca, 0x84, 0x13, 0xae, 0xf0, 0x79, - 0x34, 0x7f, 0xbc, 0x7a, 0x13, 0xa6, 0x79, 0x17, 0x6e, 0xc1, 0x0c, 0xef, 0x0c, 0x66, 0x0c, 0xda, - 0x58, 0x81, 0xba, 0x3b, 0x1a, 0x0e, 0x75, 0x67, 0xac, 0x54, 0xd8, 0x2b, 0xbf, 0x89, 0x4f, 0xc3, - 0x34, 0xff, 0x95, 0x32, 0xc5, 0x5e, 0x88, 0x96, 0xba, 0x07, 0x4b, 0x31, 0xc1, 0x5c, 0xdb, 0x32, - 0x5d, 0x82, 0xaf, 0xc1, 0x8c, 0x23, 0x9e, 0xd9, 0x34, 0xcd, 0xd5, 0x87, 0x27, 0x66, 0xde, 0x27, - 0xa2, 0x05, 0x24, 0xd4, 0xd7, 0xe0, 0xd4, 0x15, 0xa2, 0x3b, 0xde, 0x2e, 0xd1, 0xbd, 0x36, 0xf1, - 0xfc, 0xf5, 0x7b, 0x09, 0x1a, 0x86, 0xe9, 0x7a, 0xba, 0xd9, 0x21, 0xae, 0x82, 0xd8, 0x1a, 0x5d, - 0x98, 0x78, 0x1a, 0x99, 0xe0, 0xe5, 0x01, 0x19, 0x12, 0xd3, 0xd3, 0x42, 0x72, 0x6a, 0x3b, 0x3a, - 0xa5, 0xf8, 0xc5, 0x11, 0x2a, 0xbb, 0x0f, 0xc0, 0xa7, 0xb0, 0xdd, 0x15, 0x8b, 0x28, 0xf5, 0xa8, - 0x9f, 0x20, 0x58, 0x8c, 0x0a, 0x52, 0xca, 0x7a, 0xe1, 0x1d, 0x79, 0x61, 0xb8, 0xf1, 0x3c, 0x36, - 0x31, 0xbd, 0x6d, 0x31, 0xf2, 0xca, 0xae, 0xe6, 0x46, 0x96, 0x64, 0x08, 0x73, 0x91, 0x77, 0xc5, - 0x16, 0x83, 0xbe, 0x27, 0x8e, 0x73, 0x8d, 0xb8, 0xae, 0xde, 0x23, 0xc2, 0xb0, 0xa4, 0x1e, 0x75, - 0x03, 0x1a, 0x6d, 0xaf, 0xcd, 0xc9, 0xe1, 0x45, 0xa8, 0x75, 0xac, 0x91, 0xe9, 0xb1, 0x69, 0xa6, - 0x34, 0xde, 0xc0, 0x67, 0xa1, 0x69, 0x99, 0x03, 0xc3, 0x24, 0x1b, 0xec, 0x5d, 0x85, 0xbd, 0x93, - 0xbb, 0x54, 0x15, 0xa0, 0xed, 0xf9, 0x5c, 0xa7, 0x53, 0x51, 0xff, 0x0f, 0x6a, 0x6d, 0x6f, 0xcd, - 0xb6, 0x0f, 0x78, 0xfd, 0x6f, 0x44, 0x69, 0xe8, 0x9e, 0xe1, 0x7a, 0x46, 0xc7, 0xc5, 0xcf, 0xc1, - 0x8c, 0x1f, 0x07, 0x84, 0xaa, 0x56, 0x27, 0xf7, 0x4b, 0x5f, 0x1e, 0x2d, 0xa0, 0x81, 0x9f, 0x8f, - 0xea, 0x8a, 0x12, 0x7c, 0x24, 0x03, 0x41, 0x5f, 0x36, 0x49, 0x51, 0x78, 0x1d, 0xaa, 0xba, 0x6d, - 0xbb, 0x6c, 0x4d, 0x9b, 0xab, 0x2b, 0x19, 0xa8, 0xad, 0xd9, 0xb6, 0xc6, 0xc6, 0xaa, 0xef, 0x20, - 0x38, 0xbd, 0x45, 0x7c, 0x7e, 0xdd, 0x6d, 0x73, 0xcf, 0xf2, 0xdd, 0x4e, 0x81, 0xba, 0x65, 0x7b, - 0x86, 0x65, 0x72, 0xa7, 0x6b, 0x68, 0x7e, 0x93, 0x2e, 0xa0, 0x6e, 0xdb, 0x81, 0xb6, 0x79, 0x83, - 0x6a, 0x49, 0xcc, 0xf6, 0x9c, 0x3e, 0xf4, 0x35, 0x2d, 0x77, 0x51, 0x43, 0x62, 0x6b, 0x7d, 0xdd, - 0x1c, 0x8c, 0x95, 0xea, 0x59, 0xf4, 0xc0, 0x8c, 0x16, 0x76, 0xa8, 0x3f, 0xaf, 0xc0, 0x72, 0x82, - 0x95, 0x72, 0x1c, 0xa7, 0x0b, 0x0b, 0xfa, 0x60, 0xe0, 0xcf, 0xb4, 0x49, 0x3c, 0xdd, 0x18, 0x64, - 0x76, 0x20, 0x31, 0x9c, 0x8f, 0xd6, 0x92, 0x04, 0x71, 0x1b, 0xc0, 0x0d, 0x0c, 0x4a, 0x68, 0x29, - 0x8b, 0xce, 0xfd, 0xa1, 0x9a, 0x44, 0x46, 0xfd, 0x0c, 0xc1, 0x89, 0x6b, 0x46, 0xc7, 0xb1, 0xc4, - 0x64, 0xcf, 0x10, 0x16, 0xb7, 0x3d, 0x62, 0xea, 0xc2, 0xa2, 0x1b, 0x9a, 0x68, 0x51, 0x0d, 0xda, - 0x8e, 0xf5, 0x2a, 0xe9, 0x78, 0x7e, 0xa4, 0x17, 0xcd, 0x50, 0x83, 0x53, 0x87, 0x68, 0xb0, 0x9a, - 0xd4, 0xa0, 0x02, 0xf5, 0x7d, 0xe2, 0xb8, 0x86, 0x65, 0x2a, 0x35, 0x4e, 0x51, 0x34, 0xe9, 0x58, - 0x62, 0xee, 0x1b, 0x8e, 0x65, 0xd2, 0x00, 0xaa, 0x4c, 0xf3, 0xb1, 0x52, 0x17, 0x9b, 0x73, 0x60, - 0xe8, 0xae, 0x52, 0x17, 0x73, 0xd2, 0x86, 0xfa, 0x69, 0x1d, 0x66, 0x65, 0x79, 0x8e, 0x88, 0x36, - 0x79, 0x4d, 0x4f, 0x62, 0xbc, 0x9a, 0x60, 0xbc, 0x4b, 0xdc, 0x8e, 0x63, 0x30, 0xe3, 0x16, 0x62, - 0xc9, 0x5d, 0x74, 0xce, 0x01, 0xd9, 0x27, 0x03, 0x21, 0x14, 0x6f, 0xb0, 0x6d, 0x54, 0xec, 0xdb, - 0x75, 0xee, 0x1e, 0xa2, 0x89, 0xaf, 0x42, 0xcd, 0xd6, 0xbd, 0xbe, 0xab, 0x00, 0xb3, 0xa8, 0x2f, - 0x65, 0xb5, 0xa8, 0x1b, 0xba, 0xd7, 0xd7, 0x38, 0x09, 0xb6, 0x25, 0x7b, 0xba, 0x37, 0x72, 0x95, - 0x19, 0xb1, 0x25, 0xb3, 0x16, 0x26, 0x00, 0xb6, 0x63, 0xd9, 0xc4, 0xf1, 0x0c, 0xe2, 0x2a, 0x0d, - 0x36, 0xd1, 0xe5, 0x89, 0x27, 0x92, 0x17, 0x7c, 0xe5, 0x46, 0x40, 0xe7, 0xb2, 0xe9, 0x39, 0x63, - 0x4d, 0x22, 0x4c, 0x95, 0xe1, 0x19, 0x43, 0xe2, 0x7a, 0xfa, 0xd0, 0x56, 0x9a, 0x5c, 0x19, 0x41, - 0x07, 0xbe, 0x09, 0x0d, 0xdb, 0xb1, 0xf6, 0x8d, 0x2e, 0x71, 0x5c, 0x65, 0x96, 0xf1, 0x70, 0x2e, - 0x17, 0x0f, 0xcf, 0x90, 0xb1, 0x16, 0x92, 0x0a, 0x2d, 0x65, 0x4e, 0xb2, 0x14, 0x2a, 0xf2, 0xb3, - 0xeb, 0x6d, 0xcf, 0xd1, 0x3d, 0xd2, 0x1b, 0x2b, 0xf3, 0x45, 0x44, 0x0e, 0xe9, 0x08, 0x91, 0xc3, - 0x0e, 0xac, 0xc2, 0xec, 0xd0, 0xea, 0xee, 0x04, 0x52, 0x9f, 0x60, 0x3c, 0x44, 0xfa, 0xe2, 0xc6, - 0x7e, 0x32, 0x69, 0xec, 0xf7, 0x01, 0xf0, 0xe9, 0x89, 0xb3, 0x3e, 0x56, 0x16, 0xf8, 0xae, 0x17, - 0xf6, 0xe0, 0xaf, 0x40, 0x63, 0xcf, 0xd1, 0x87, 0xe4, 0x8e, 0xe5, 0xdc, 0x56, 0x30, 0x0b, 0x0d, - 0xe7, 0x27, 0x96, 0xe5, 0x69, 0x3a, 0xf2, 0x96, 0xe5, 0xdc, 0x16, 0xaa, 0x1b, 0x6b, 0x21, 0xb1, - 0xd6, 0x45, 0x38, 0x11, 0xd3, 0x28, 0x3e, 0x09, 0x53, 0xb7, 0xc9, 0x58, 0x38, 0x13, 0x7d, 0xa4, - 0x2b, 0xbc, 0xaf, 0x0f, 0x46, 0xc4, 0x77, 0x23, 0xd6, 0x38, 0x5f, 0x39, 0x87, 0xe8, 0xf0, 0xd8, - 0xea, 0x64, 0x19, 0xae, 0xae, 0xc1, 0x42, 0x82, 0x3b, 0x8c, 0xa1, 0x6a, 0x52, 0xbf, 0xe4, 0x14, - 0xd8, 0xb3, 0xec, 0x90, 0x95, 0x88, 0x43, 0xaa, 0x7f, 0x47, 0xd0, 0xf4, 0xf7, 0xcf, 0xd1, 0x80, - 0x50, 0x17, 0x70, 0x46, 0x83, 0x30, 0x1a, 0x88, 0x16, 0xcd, 0x71, 0xe9, 0xd3, 0xce, 0xd8, 0xf6, - 0xf9, 0x08, 0xda, 0xd4, 0x6e, 0x75, 0xcf, 0x73, 0x8c, 0xdd, 0x91, 0xe7, 0x87, 0x83, 0xb0, 0x83, - 0xc5, 0x45, 0xdd, 0xf3, 0x88, 0x13, 0x04, 0x03, 0xd1, 0x9c, 0x20, 0x18, 0x44, 0x3c, 0x62, 0x3a, - 0xee, 0x11, 0x71, 0xe3, 0xa9, 0x27, 0x8d, 0x47, 0x7d, 0x0f, 0xc1, 0xe9, 0xb5, 0x6e, 0xf7, 0xba, - 0xf3, 0x82, 0xdd, 0xd5, 0x3d, 0x22, 0x8b, 0x2a, 0x8b, 0x84, 0x0e, 0x13, 0xa9, 0x72, 0x88, 0x48, - 0x53, 0x87, 0x8a, 0x54, 0x4d, 0x88, 0xa4, 0xfe, 0x21, 0x5c, 0x70, 0x1a, 0x7a, 0xa8, 0xba, 0x68, - 0xf0, 0xf1, 0xd5, 0x45, 0x9f, 0xf1, 0xd7, 0x61, 0x46, 0x84, 0x85, 0xb1, 0xd8, 0x28, 0xd7, 0xf3, - 0x84, 0x35, 0x3f, 0xd8, 0x08, 0xbf, 0x0b, 0x68, 0xb6, 0x9e, 0x80, 0xb9, 0xc8, 0xab, 0x4c, 0x46, - 0x77, 0x0e, 0x66, 0x82, 0x4c, 0x01, 0x43, 0xb5, 0x63, 0x75, 0xf9, 0xf2, 0xd5, 0x34, 0xf6, 0x4c, - 0x17, 0x67, 0x28, 0xf2, 0x4f, 0x61, 0x6b, 0xa2, 0xa9, 0xfe, 0x0d, 0xc1, 0xa9, 0x2d, 0xe2, 0x5d, - 0x7e, 0x9d, 0xfa, 0x25, 0x4d, 0xaf, 0x44, 0xee, 0x83, 0xa1, 0xea, 0x85, 0x4a, 0x60, 0xcf, 0x25, - 0x6c, 0x3d, 0x91, 0xad, 0xae, 0x16, 0xdf, 0xea, 0xe4, 0x33, 0xdc, 0x74, 0xec, 0x0c, 0x17, 0x0b, - 0x40, 0xf5, 0x44, 0x00, 0x52, 0x7f, 0x87, 0x60, 0x31, 0x2a, 0x59, 0x39, 0xa9, 0x54, 0x44, 0x86, - 0xca, 0x61, 0x32, 0x4c, 0x1d, 0x7c, 0x0e, 0xad, 0x46, 0xce, 0xa1, 0xea, 0xaf, 0xa7, 0x60, 0x71, - 0xc3, 0x21, 0x92, 0x73, 0x08, 0xb5, 0x5c, 0x87, 0xba, 0xa0, 0x2d, 0x58, 0x7f, 0x34, 0x57, 0xfc, - 0xd7, 0x7c, 0x2a, 0xf8, 0x05, 0xa8, 0x51, 0x07, 0xf3, 0x4f, 0x4f, 0x97, 0x26, 0x26, 0x97, 0xee, - 0xc0, 0x1a, 0xa7, 0x86, 0x5f, 0x86, 0xaa, 0xa7, 0xf7, 0x68, 0xce, 0x47, 0xa9, 0x6e, 0x4d, 0x4c, - 0x35, 0x4d, 0xe8, 0x95, 0x1d, 0xbd, 0x27, 0x76, 0x66, 0x46, 0x14, 0xbf, 0x2c, 0x9f, 0x24, 0xaa, - 0x6c, 0x86, 0x8b, 0xb9, 0x96, 0x21, 0xe5, 0x4c, 0xd1, 0x7a, 0x1c, 0x1a, 0xc1, 0x7c, 0x99, 0x7c, - 0xf0, 0x2d, 0x04, 0x4b, 0x31, 0xf6, 0x3f, 0x07, 0x83, 0x53, 0xaf, 0xc2, 0xe2, 0x26, 0x19, 0x90, - 0x84, 0xe5, 0x1c, 0x99, 0x55, 0xee, 0x59, 0x4e, 0x87, 0x8b, 0x35, 0xa3, 0xf1, 0x86, 0xba, 0x07, - 0x4b, 0x31, 0x5a, 0xe5, 0xc0, 0x1e, 0x0f, 0xc3, 0x42, 0x78, 0xee, 0x99, 0x88, 0x61, 0xf5, 0xb7, - 0x08, 0xb0, 0x3c, 0xa6, 0x9c, 0xa5, 0x96, 0xdc, 0xad, 0x72, 0x1c, 0xee, 0xa6, 0x2e, 0xca, 0x5c, - 0xfb, 0xf8, 0x98, 0xfa, 0x31, 0x0f, 0xc2, 0x61, 0x77, 0x39, 0xd2, 0x3c, 0x2f, 0x9d, 0xe8, 0xb9, - 0xbb, 0xe7, 0x14, 0x27, 0x20, 0xa3, 0xfe, 0x0b, 0xc1, 0x99, 0x48, 0x10, 0xa0, 0x7b, 0xd8, 0x84, - 0xb8, 0x9f, 0x13, 0xc9, 0xe0, 0x39, 0x43, 0xda, 0xc4, 0x0c, 0x1d, 0x38, 0xeb, 0x61, 0xe9, 0x7c, - 0xc1, 0xdc, 0x50, 0xbd, 0x0d, 0xad, 0xb4, 0x79, 0xcb, 0xf1, 0x8a, 0xc7, 0x64, 0x60, 0x82, 0x06, - 0x57, 0x77, 0x62, 0xd7, 0x58, 0x4e, 0x0c, 0x2c, 0xc7, 0xa2, 0xae, 0x46, 0x77, 0x8f, 0xcc, 0x07, - 0x3d, 0x69, 0xcb, 0x50, 0x3f, 0x42, 0xa0, 0x24, 0xf7, 0x93, 0x89, 0x2c, 0x29, 0x4c, 0x90, 0x2b, - 0x91, 0x04, 0xb9, 0x0d, 0x55, 0xfa, 0x24, 0x90, 0x87, 0xc2, 0x7b, 0x1b, 0x23, 0xa6, 0xbe, 0x1a, - 0xb3, 0x78, 0xce, 0x66, 0x39, 0x26, 0xf0, 0x7d, 0x9e, 0x29, 0x67, 0xb6, 0x81, 0x92, 0xb6, 0x75, - 0xf5, 0x4d, 0x04, 0xcb, 0x09, 0x7e, 0xca, 0x31, 0x2d, 0x05, 0xea, 0x1a, 0xd3, 0x22, 0x97, 0xa1, - 0xa1, 0xf9, 0x4d, 0xb5, 0x0d, 0x67, 0xa2, 0xbb, 0xd2, 0xe4, 0xcb, 0xa2, 0x40, 0xdd, 0x89, 0x12, - 0x15, 0x4d, 0xea, 0xd9, 0x69, 0x44, 0xcb, 0x51, 0xeb, 0xa3, 0xb0, 0x14, 0x3a, 0x28, 0xcd, 0x36, - 0x26, 0x73, 0xec, 0xff, 0x44, 0xa0, 0x4a, 0x3e, 0xae, 0x9c, 0xc5, 0xff, 0x9a, 0x48, 0xdf, 0xb8, - 0xf5, 0x6c, 0x4f, 0x4c, 0x2a, 0x9d, 0xbb, 0x78, 0x02, 0x97, 0x3f, 0xc7, 0x7a, 0x05, 0x96, 0x23, - 0xb6, 0xb9, 0xa3, 0xf7, 0x26, 0x53, 0xbc, 0x98, 0xa4, 0x92, 0x32, 0xc9, 0x94, 0x34, 0x89, 0x6a, - 0xc4, 0x62, 0x10, 0x9b, 0xa0, 0x1c, 0x23, 0xf8, 0x14, 0xc1, 0x52, 0xe8, 0x4b, 0x13, 0x5b, 0x01, - 0xfe, 0x6a, 0x44, 0x37, 0x57, 0xb2, 0x78, 0x76, 0x72, 0xae, 0xe3, 0x53, 0x4d, 0x4f, 0x8e, 0x54, - 0x25, 0xda, 0xa6, 0xfa, 0x2c, 0x28, 0x11, 0x4f, 0x9d, 0x7c, 0xe5, 0x30, 0x54, 0x6f, 0x93, 0xb1, - 0xef, 0xfa, 0xec, 0x99, 0x46, 0xf3, 0x14, 0x6a, 0xe5, 0x70, 0x3e, 0x86, 0xe6, 0x15, 0xa2, 0x0f, - 0xbc, 0xfe, 0x46, 0x9f, 0x74, 0x6e, 0x53, 0x76, 0x86, 0xfe, 0x41, 0xbd, 0xa1, 0xb1, 0x67, 0x86, - 0x3c, 0x58, 0x0e, 0x47, 0xab, 0x6b, 0x1a, 0x7b, 0xa6, 0x47, 0x48, 0xc3, 0xf4, 0x88, 0xb3, 0xaf, - 0x0f, 0x98, 0xb1, 0xd6, 0xb4, 0xa0, 0x4d, 0xf5, 0xc1, 0xb0, 0x17, 0x76, 0x80, 0xac, 0x69, 0xbc, - 0x41, 0xf5, 0x36, 0x72, 0x06, 0xe2, 0x40, 0x4d, 0x1f, 0xd5, 0x7f, 0x56, 0x61, 0x31, 0xed, 0xe4, - 0x13, 0xbb, 0xbc, 0x42, 0x89, 0xcb, 0xab, 0xc3, 0x4f, 0xb7, 0xf7, 0x42, 0x83, 0x98, 0x5d, 0xdb, - 0x32, 0x4c, 0x8f, 0x9f, 0xf5, 0x1a, 0x5a, 0xd8, 0x41, 0x19, 0xef, 0x5b, 0xae, 0x27, 0x41, 0xe9, - 0x41, 0x5b, 0x82, 0x75, 0x6b, 0x11, 0x58, 0x77, 0x18, 0x49, 0x0a, 0xa7, 0x99, 0x8d, 0x5f, 0x2b, - 0x74, 0xb8, 0x3b, 0x14, 0xde, 0xbd, 0x09, 0xcd, 0x7e, 0xa8, 0x12, 0x06, 0x23, 0x64, 0x49, 0x63, - 0x24, 0x75, 0x6a, 0x32, 0xa1, 0x28, 0x48, 0x36, 0x13, 0x07, 0xc9, 0x5e, 0x81, 0xf9, 0xae, 0xee, - 0xe9, 0x1b, 0x84, 0xaa, 0x71, 0xdb, 0xdc, 0xb3, 0x94, 0x06, 0x9b, 0xf8, 0xf1, 0x89, 0x27, 0xde, - 0x8c, 0x0c, 0xd7, 0x62, 0xe4, 0x12, 0x28, 0x1c, 0xa4, 0x40, 0xb8, 0x12, 0x2a, 0xd3, 0x8c, 0xa0, - 0x32, 0x45, 0x93, 0xe4, 0x5d, 0x98, 0x8f, 0xb2, 0x97, 0x0a, 0x7f, 0xd2, 0x9c, 0x8d, 0xf4, 0x42, - 0xf4, 0x53, 0xb4, 0xf0, 0xfd, 0x30, 0xa7, 0xef, 0xeb, 0xc6, 0x40, 0xdf, 0x1d, 0x90, 0x97, 0x2c, - 0xd3, 0x8f, 0xcf, 0xd1, 0x4e, 0xf5, 0x16, 0x2c, 0xa7, 0xe9, 0xfa, 0x19, 0x32, 0x2e, 0x66, 0xd1, - 0xaa, 0x07, 0xcb, 0x9a, 0x00, 0xa9, 0x03, 0x74, 0x40, 0x04, 0x97, 0x17, 0xa9, 0x1f, 0xf2, 0x2e, - 0x11, 0x0d, 0x0a, 0xa2, 0x0e, 0x01, 0x39, 0xf5, 0x3b, 0x08, 0x94, 0xe4, 0xb4, 0xe5, 0xec, 0xed, - 0x47, 0xdd, 0xdd, 0xbf, 0x08, 0x67, 0x5e, 0x30, 0x9d, 0x03, 0xd6, 0xa0, 0x58, 0x59, 0x00, 0x3d, - 0x3e, 0xa5, 0x90, 0x2e, 0x27, 0xda, 0xde, 0x80, 0x93, 0x41, 0x09, 0xc2, 0xf1, 0xb0, 0xbf, 0x0b, - 0x0b, 0x12, 0xc5, 0x72, 0xb8, 0xfe, 0x0d, 0x82, 0xc5, 0xa7, 0x0d, 0xb3, 0xeb, 0xaf, 0x4e, 0xb0, - 0xb5, 0x3d, 0x08, 0x0b, 0x1d, 0xcb, 0x74, 0x47, 0x43, 0xe2, 0xb4, 0x63, 0x22, 0x24, 0x5f, 0xe4, - 0x86, 0x6a, 0xcf, 0x42, 0x53, 0x44, 0x01, 0x9a, 0x00, 0xfb, 0x58, 0xb9, 0xd4, 0xc5, 0x80, 0x61, - 0x9a, 0x7e, 0xd4, 0xf8, 0x26, 0x4a, 0x9f, 0xd5, 0x3f, 0x23, 0x58, 0x8a, 0x31, 0x5d, 0x8e, 0xed, - 0xbe, 0x9c, 0xac, 0xf7, 0x38, 0x36, 0xe4, 0x4f, 0xfd, 0x18, 0xb1, 0xb4, 0xfc, 0xba, 0x49, 0xe2, - 0x56, 0x9f, 0x6d, 0xed, 0x1f, 0x84, 0x05, 0xff, 0x26, 0xaf, 0x1d, 0x0b, 0x34, 0xc9, 0x17, 0x78, - 0x05, 0xb0, 0xdf, 0xb9, 0x1d, 0x1a, 0x1f, 0x57, 0x4d, 0xca, 0x9b, 0x60, 0xfd, 0xab, 0xd2, 0xfa, - 0xff, 0x89, 0x1f, 0x0c, 0x22, 0x9c, 0x97, 0xa3, 0x00, 0x39, 0x06, 0x56, 0x8e, 0x37, 0x06, 0xbe, - 0xcd, 0x41, 0xb0, 0x82, 0x86, 0x9f, 0x6d, 0xf1, 0xb1, 0x04, 0x53, 0x4b, 0x8b, 0xb9, 0x18, 0xe5, - 0xe3, 0x7f, 0xd0, 0x96, 0x5d, 0xb8, 0x87, 0x9f, 0x63, 0xfc, 0x97, 0x6d, 0x96, 0x5e, 0x1d, 0x4b, - 0x1c, 0x94, 0x72, 0xb7, 0x29, 0x39, 0x77, 0x53, 0x87, 0x70, 0x6f, 0xfa, 0xa4, 0xe5, 0x84, 0xca, - 0xf7, 0x2a, 0x3e, 0x1a, 0xe7, 0xcf, 0x97, 0x01, 0x7c, 0x3c, 0x4a, 0x46, 0x37, 0x92, 0x87, 0xf2, - 0x6b, 0x8c, 0x76, 0x46, 0x70, 0x32, 0x8d, 0xad, 0x32, 0xd1, 0xc9, 0x41, 0x5c, 0xe9, 0xa5, 0xc2, - 0x93, 0x17, 0x60, 0xf1, 0x96, 0xee, 0x75, 0xfa, 0xf1, 0x60, 0x79, 0x3f, 0xcc, 0xb9, 0x64, 0xb0, - 0x17, 0xf7, 0xd5, 0x68, 0xa7, 0xfa, 0x51, 0x05, 0x96, 0x62, 0xc3, 0xcb, 0x71, 0xb3, 0xd3, 0x30, - 0xad, 0x77, 0x3c, 0x29, 0xcf, 0xe4, 0x2d, 0x7c, 0x95, 0x2f, 0x2c, 0x87, 0x06, 0xf3, 0x17, 0x6d, - 0x30, 0x95, 0xc8, 0x51, 0xb1, 0x7a, 0xbc, 0x51, 0xf1, 0x59, 0x38, 0xb9, 0x45, 0x3c, 0x51, 0xe7, - 0x3a, 0x91, 0x65, 0xcb, 0x37, 0x8e, 0x95, 0xe8, 0x8d, 0xa3, 0xda, 0x66, 0x21, 0x76, 0x6d, 0x30, - 0xc8, 0x42, 0xf0, 0x3e, 0x80, 0x3b, 0x86, 0xd7, 0xe7, 0x43, 0xc4, 0x05, 0x91, 0xd4, 0xa3, 0xfe, - 0x14, 0xf1, 0xeb, 0x1b, 0x41, 0xb2, 0x34, 0x35, 0xba, 0x21, 0x03, 0x41, 0x65, 0x2e, 0xb3, 0x36, - 0xf6, 0xd4, 0x16, 0x37, 0xa9, 0xe2, 0xb8, 0x10, 0xe9, 0x54, 0x7f, 0xc5, 0x63, 0xba, 0x24, 0x78, - 0x39, 0x5c, 0x6e, 0x49, 0x5c, 0xe6, 0xaa, 0x64, 0xf6, 0x0b, 0x8e, 0xaf, 0xc3, 0x29, 0x01, 0x4b, - 0x1c, 0x93, 0xe6, 0x49, 0x70, 0x2d, 0x58, 0xe6, 0x02, 0xa8, 0x6f, 0x20, 0x38, 0x25, 0x57, 0x4a, - 0x17, 0x66, 0xfc, 0xa0, 0x92, 0xec, 0x43, 0x2e, 0xcf, 0x49, 0xb4, 0x0a, 0xbd, 0x3c, 0x34, 0xe7, - 0xf4, 0x5a, 0xb7, 0xbb, 0x49, 0x6c, 0x62, 0x76, 0x89, 0xd9, 0x31, 0xc2, 0x8c, 0xe5, 0x15, 0x98, - 0xed, 0x4a, 0xdd, 0xa2, 0x62, 0xfb, 0x89, 0xc9, 0x2f, 0xc1, 0x45, 0x56, 0x13, 0xd0, 0x1e, 0x6b, - 0x11, 0x82, 0x6a, 0x9f, 0xa1, 0xf0, 0xd1, 0xa9, 0xcb, 0x11, 0xf2, 0x1b, 0x70, 0x86, 0xdf, 0x69, - 0x7f, 0x2e, 0x72, 0xfe, 0x03, 0x01, 0x4e, 0xfe, 0x08, 0xef, 0xc0, 0x8c, 0x9f, 0xf8, 0x09, 0x19, - 0xf3, 0xc7, 0xef, 0x80, 0x52, 0xb4, 0x96, 0xaf, 0x72, 0x7c, 0xb5, 0x7c, 0x2d, 0x98, 0xb1, 0xf6, - 0x89, 0xe3, 0x18, 0x5d, 0x7e, 0xe2, 0x9a, 0xd1, 0x82, 0x36, 0x3d, 0x10, 0xa7, 0x2d, 0x6f, 0x39, - 0xba, 0x34, 0xd9, 0x21, 0x21, 0x4d, 0x91, 0x47, 0xc6, 0x7f, 0x57, 0x1f, 0x92, 0x4d, 0x6b, 0xa8, - 0x1b, 0xa6, 0x1f, 0xff, 0xc3, 0x1e, 0xea, 0xa1, 0xa6, 0xd5, 0x26, 0x83, 0x3d, 0x21, 0x9e, 0x68, - 0xa9, 0x7f, 0x44, 0xd0, 0xda, 0x22, 0xde, 0x86, 0x65, 0xde, 0x05, 0xe9, 0x70, 0x3b, 0xa9, 0xbe, - 0x9c, 0xb7, 0xdb, 0x21, 0x1d, 0x5f, 0x84, 0x1b, 0x8e, 0x75, 0x97, 0x44, 0xf0, 0xad, 0xb1, 0xa8, - 0x08, 0x01, 0x1d, 0xf5, 0x67, 0xd3, 0x30, 0x17, 0x29, 0xd4, 0xc6, 0x2f, 0xc2, 0xec, 0x50, 0xfa, - 0x71, 0xb1, 0x42, 0xa2, 0x08, 0xa9, 0x52, 0xcf, 0x34, 0xf8, 0x79, 0x68, 0x8a, 0x5d, 0xc1, 0xdc, - 0xb3, 0xfc, 0x9c, 0x3c, 0xf3, 0x0e, 0x2b, 0xd3, 0x08, 0xef, 0xaf, 0xab, 0x85, 0xef, 0xaf, 0xa3, - 0x06, 0x58, 0x3b, 0x1e, 0x03, 0x8c, 0x9a, 0xc4, 0xf4, 0xf1, 0x98, 0x04, 0xde, 0x11, 0xa7, 0xde, - 0x3a, 0xa3, 0xf7, 0x54, 0xbe, 0x7a, 0xff, 0x44, 0x55, 0xd6, 0x2a, 0x2c, 0xca, 0xb6, 0x70, 0x93, - 0x63, 0x46, 0xae, 0x32, 0xc3, 0xce, 0xd6, 0xa9, 0xef, 0xf0, 0x35, 0xa8, 0xb3, 0xca, 0xfe, 0x8e, - 0x2b, 0x10, 0xf0, 0x5c, 0xff, 0x1d, 0xe0, 0xd3, 0xc8, 0x7f, 0x79, 0xf5, 0x09, 0x02, 0x25, 0xbc, - 0xbb, 0x14, 0xff, 0xd0, 0x50, 0x92, 0x97, 0xdf, 0x88, 0xd7, 0x14, 0xe5, 0xfd, 0x87, 0x8b, 0xa0, - 0xa8, 0xe8, 0x2a, 0xe0, 0x4d, 0x32, 0x88, 0x15, 0x15, 0xb1, 0xb0, 0xed, 0xc7, 0x70, 0xff, 0x1f, - 0x58, 0xa4, 0x9e, 0x03, 0x4a, 0xbe, 0xb4, 0x28, 0x2d, 0xd7, 0x66, 0x00, 0x7e, 0xf4, 0x5f, 0x98, - 0x50, 0xfc, 0x5f, 0x98, 0x8e, 0xc0, 0xd4, 0x7f, 0x8f, 0x58, 0x36, 0x5b, 0x76, 0x79, 0xd3, 0xad, - 0x44, 0x79, 0xd3, 0xe4, 0xa9, 0x48, 0x52, 0x66, 0xa9, 0xc8, 0x69, 0x15, 0xe6, 0xe9, 0xe1, 0xc1, - 0x0e, 0xb1, 0x85, 0x58, 0xf5, 0x29, 0x4a, 0x56, 0x9f, 0xbe, 0x0e, 0x27, 0x82, 0x31, 0xe5, 0x1d, - 0x6c, 0x6d, 0x3b, 0x2c, 0x65, 0x10, 0xad, 0xd5, 0xbf, 0xde, 0x13, 0x14, 0x33, 0x6f, 0x78, 0xce, - 0x00, 0xbf, 0x85, 0xa0, 0x46, 0x5e, 0x37, 0x5c, 0x0f, 0x5f, 0xc8, 0x72, 0x8f, 0x1f, 0xaf, 0x08, - 0x6e, 0x5d, 0xcc, 0x39, 0x5a, 0xb0, 0xfb, 0x6d, 0x04, 0xd3, 0x1d, 0x96, 0xeb, 0xe0, 0x8b, 0x85, - 0xca, 0x41, 0x5b, 0x4f, 0xe6, 0x1d, 0x2e, 0x71, 0xd2, 0x65, 0x67, 0xa1, 0x0c, 0x9c, 0xa4, 0xd5, - 0x54, 0x66, 0xe0, 0x24, 0xbd, 0x8c, 0xf2, 0x0d, 0x04, 0xd3, 0x3d, 0x86, 0xdb, 0xe2, 0xf3, 0x39, - 0x6a, 0x2c, 0x7c, 0x36, 0x9e, 0xc8, 0x35, 0x56, 0xf0, 0xf0, 0x0e, 0x82, 0x66, 0x2f, 0xac, 0x3d, - 0xc4, 0x79, 0x88, 0xf9, 0x7e, 0xd1, 0xba, 0x90, 0x6f, 0xb0, 0x60, 0xe5, 0x43, 0x04, 0x27, 0x47, - 0x0c, 0xc0, 0x0a, 0x51, 0x30, 0xbc, 0x5e, 0xbc, 0x22, 0xb0, 0xb5, 0x51, 0x88, 0x86, 0xe0, 0xee, - 0x7b, 0x08, 0xea, 0x7a, 0xb7, 0xcb, 0x2e, 0x41, 0x2e, 0xe5, 0xa8, 0xba, 0x90, 0xcb, 0x94, 0x5a, - 0x4f, 0xe5, 0x27, 0x20, 0xb1, 0xd3, 0x23, 0x5e, 0x46, 0x76, 0xd2, 0x0b, 0x0a, 0x33, 0xb0, 0x73, - 0x50, 0x61, 0xe1, 0x0f, 0x11, 0x00, 0xd7, 0x1d, 0xe3, 0x68, 0x2d, 0xdf, 0x8a, 0x4b, 0x25, 0x7f, - 0xad, 0xf5, 0x22, 0x24, 0x04, 0x57, 0x3f, 0x46, 0x00, 0xdc, 0xd5, 0x19, 0x57, 0xeb, 0x39, 0xfd, - 0x55, 0x5e, 0xaa, 0x8d, 0x42, 0x34, 0x04, 0x5f, 0xdf, 0xe5, 0xb6, 0x44, 0x93, 0x15, 0xfc, 0x64, - 0xb1, 0x0a, 0x9e, 0xd6, 0xa5, 0xdc, 0xe3, 0x25, 0x66, 0x7a, 0xc4, 0xcb, 0xc8, 0x4c, 0x6a, 0x01, - 0x5b, 0xeb, 0x52, 0xc1, 0x52, 0x31, 0xfc, 0x03, 0x04, 0x0d, 0x6e, 0x47, 0x3b, 0x7a, 0x0f, 0x3f, - 0x95, 0xcf, 0x06, 0xc2, 0xb2, 0xb0, 0xd6, 0x5a, 0x01, 0x0a, 0x92, 0x69, 0x73, 0x23, 0x62, 0x4b, - 0xb4, 0x96, 0xcf, 0x00, 0xe4, 0x55, 0x5a, 0x2f, 0x42, 0x42, 0x70, 0xf5, 0x2d, 0x04, 0x73, 0x3d, - 0x1f, 0x75, 0x65, 0x49, 0xda, 0x97, 0x33, 0xad, 0xbd, 0x0c, 0xcf, 0xb5, 0xce, 0xe7, 0x19, 0x2a, - 0x18, 0x79, 0x1f, 0xc1, 0xc9, 0x9e, 0x84, 0xad, 0x32, 0x5e, 0x32, 0x6d, 0x04, 0x71, 0x3c, 0x3a, - 0x5b, 0xaa, 0x91, 0x04, 0x75, 0xdf, 0x45, 0x30, 0xdb, 0x95, 0xc0, 0xce, 0x0c, 0xdc, 0xa4, 0x80, - 0xae, 0xad, 0x8b, 0x39, 0x47, 0x4b, 0xdc, 0x0c, 0x25, 0x3c, 0x32, 0x03, 0x37, 0x29, 0x48, 0x6a, - 0x06, 0x6e, 0x52, 0x41, 0xd0, 0xf7, 0x10, 0xcc, 0xc9, 0xdc, 0xb8, 0x38, 0x1f, 0x41, 0x37, 0x7b, - 0x0e, 0x94, 0xfe, 0x05, 0x8d, 0x5f, 0x20, 0xf8, 0x7f, 0x3d, 0x0a, 0x66, 0x3e, 0x6d, 0x39, 0xf2, - 0xd1, 0xd5, 0xcd, 0xb6, 0xdd, 0xa6, 0x00, 0x5c, 0xd9, 0xb6, 0xdb, 0x54, 0xa8, 0xe7, 0x97, 0x08, - 0xd4, 0x4e, 0x02, 0xaa, 0x4b, 0x70, 0xba, 0x9e, 0x31, 0x37, 0x4d, 0x63, 0x76, 0xa3, 0x10, 0x0d, - 0xc1, 0xef, 0x4f, 0x10, 0x2c, 0xf7, 0x18, 0x72, 0xc5, 0x90, 0x04, 0xf9, 0x37, 0xd9, 0xd2, 0x85, - 0x62, 0x1c, 0x1e, 0x02, 0x9e, 0x09, 0x0e, 0x13, 0xf8, 0xee, 0xdd, 0xe7, 0xf0, 0x20, 0x84, 0xf2, - 0x5d, 0x04, 0xf3, 0x5d, 0x39, 0x00, 0x67, 0xc9, 0x8e, 0x93, 0x27, 0xf2, 0xd6, 0x85, 0x7c, 0x83, - 0x39, 0x37, 0xab, 0x9f, 0x35, 0xe1, 0x54, 0x0c, 0x1d, 0x63, 0xe7, 0xbb, 0xf7, 0x11, 0x3d, 0x57, - 0xf2, 0x9a, 0xaa, 0x0c, 0x1b, 0xe6, 0x01, 0x55, 0x6e, 0x19, 0x36, 0xcc, 0x03, 0x0b, 0xd6, 0x68, - 0xd6, 0x35, 0x0a, 0xea, 0xbc, 0xb2, 0x64, 0xf0, 0x07, 0xd5, 0x9d, 0x65, 0xc9, 0xe0, 0x0f, 0x2e, - 0x30, 0x7b, 0x13, 0x41, 0xa3, 0xef, 0x17, 0x70, 0x65, 0xd8, 0x2e, 0xe3, 0x65, 0x64, 0x19, 0xb6, - 0xcb, 0x64, 0xbd, 0xd8, 0xdb, 0x08, 0xaa, 0x7b, 0x86, 0xd9, 0xcd, 0x10, 0x77, 0xd3, 0xea, 0xc1, - 0x32, 0xc4, 0xdd, 0xf4, 0xca, 0x2c, 0xba, 0x2d, 0xf5, 0xa4, 0x32, 0x97, 0x6c, 0x5b, 0x76, 0x82, - 0x9d, 0x8b, 0x39, 0x47, 0x0b, 0x6e, 0x3e, 0x40, 0x30, 0xdf, 0x8b, 0x54, 0x30, 0x65, 0x4b, 0x45, - 0x93, 0x45, 0x5b, 0xd9, 0x52, 0xd1, 0xb4, 0xd2, 0xa9, 0x0f, 0x11, 0xcc, 0xf2, 0x54, 0x94, 0xd7, - 0xb1, 0xe0, 0xcd, 0x9c, 0xf5, 0x1f, 0x91, 0xda, 0x9b, 0xd6, 0xe5, 0x82, 0x54, 0x04, 0x77, 0x1f, - 0x21, 0x50, 0x46, 0x89, 0x6a, 0x0f, 0x71, 0x68, 0xde, 0x38, 0x86, 0x4a, 0x95, 0xd6, 0x66, 0x31, - 0x22, 0x21, 0xbe, 0x50, 0xbb, 0xa3, 0x7b, 0x9d, 0x7e, 0x06, 0x83, 0x4f, 0xab, 0x2b, 0xc9, 0x60, - 0xf0, 0xa9, 0x75, 0x25, 0x0f, 0x21, 0x66, 0xf2, 0x7d, 0xe9, 0xab, 0x54, 0x38, 0xdf, 0x47, 0xb4, - 0xb2, 0x9b, 0x7c, 0xda, 0xa7, 0xb0, 0x56, 0xff, 0x32, 0x05, 0x0b, 0x5b, 0xd6, 0x3e, 0x71, 0x4c, - 0x19, 0xad, 0xfb, 0x80, 0x67, 0xd3, 0xd1, 0x1b, 0x9b, 0x22, 0xe0, 0xd0, 0x5a, 0x8e, 0xb1, 0x31, - 0x00, 0xfc, 0x47, 0x08, 0x4e, 0xf4, 0xa2, 0xdf, 0x25, 0xca, 0x05, 0x39, 0xc8, 0x1f, 0x57, 0xca, - 0x05, 0x39, 0x44, 0x3f, 0x89, 0xf4, 0x16, 0x67, 0x6b, 0xcd, 0xb6, 0x07, 0x46, 0x47, 0xe7, 0x1f, - 0x66, 0x7a, 0x3c, 0xd3, 0xc9, 0x21, 0x44, 0x74, 0x5b, 0xe7, 0xb2, 0x0f, 0xe4, 0x6c, 0xac, 0x3f, - 0x04, 0x93, 0x7e, 0x1f, 0xef, 0xa5, 0x1a, 0xfb, 0x9e, 0xde, 0xee, 0x34, 0xfb, 0xf3, 0xc8, 0x7f, - 0x03, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xfa, 0x1b, 0xbf, 0x68, 0x4f, 0x00, 0x00, + // 3433 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5c, 0xdb, 0x8f, 0x1c, 0xc5, + 0xd5, 0x57, 0xcd, 0xce, 0xec, 0xec, 0x9c, 0xbd, 0xd8, 0x5b, 0xde, 0xf5, 0xb6, 0x07, 0x3e, 0x3e, + 0xab, 0x85, 0xf4, 0xf1, 0x80, 0xf6, 0x83, 0xe5, 0x03, 0xfc, 0x19, 0x1b, 0xb3, 0x17, 0x63, 0xaf, + 0xc1, 0xd8, 0xf4, 0x2c, 0x76, 0x80, 0x24, 0xa8, 0x77, 0xa6, 0x76, 0xa6, 0xf1, 0x4c, 0x77, 0xd3, + 0xdd, 0xb3, 0x66, 0xa4, 0x48, 0x11, 0x08, 0x12, 0x12, 0x12, 0x08, 0x4a, 0xf2, 0xc4, 0x43, 0xa2, + 0x24, 0x3c, 0x46, 0x4a, 0xa2, 0x48, 0x28, 0x42, 0x89, 0xa2, 0x44, 0x79, 0x83, 0xc7, 0x28, 0x4f, + 0xc9, 0x7b, 0xa4, 0xbc, 0xe5, 0x0f, 0x48, 0x54, 0x97, 0xee, 0xae, 0xbe, 0xec, 0x6e, 0x5f, 0xb6, + 0x41, 0x79, 0xda, 0xae, 0xea, 0xa9, 0x53, 0xe7, 0xd4, 0xb9, 0xd4, 0xa9, 0x5f, 0x9d, 0x6d, 0x58, + 0x70, 0x89, 0xb3, 0x6f, 0x74, 0x89, 0xbb, 0x6a, 0x3b, 0x96, 0x67, 0xe1, 0xff, 0xe9, 0x5a, 0xa3, + 0xd5, 0xc1, 0x58, 0xbf, 0x4b, 0x8c, 0x55, 0x5b, 0xd7, 0xdd, 0xd5, 0xae, 0x4b, 0x56, 0xc5, 0x6f, + 0x1c, 0xd2, 0x37, 0x5c, 0xcf, 0x99, 0xac, 0xea, 0xb6, 0xa1, 0x7e, 0x1d, 0x96, 0xae, 0x5b, 0x3d, + 0x63, 0x6f, 0xd2, 0xe9, 0x0e, 0xc8, 0x48, 0x77, 0x35, 0xf2, 0xda, 0x98, 0xb8, 0x1e, 0xbe, 0x17, + 0x5a, 0xe2, 0xe7, 0xdb, 0x3d, 0x05, 0x9d, 0x45, 0x0f, 0xb4, 0xb4, 0xb0, 0x03, 0x6f, 0x43, 0xd3, + 0xe5, 0xbf, 0x57, 0x6a, 0x67, 0xa7, 0x1e, 0x98, 0x5d, 0xfb, 0xdf, 0xd5, 0x8c, 0x13, 0xae, 0xf2, + 0x79, 0x34, 0x7f, 0xbc, 0x7a, 0x0b, 0xa6, 0x79, 0x17, 0x6e, 0xc3, 0x0c, 0xef, 0x0c, 0x66, 0x0c, + 0xda, 0x58, 0x81, 0xa6, 0x3b, 0x1e, 0x8d, 0x74, 0x67, 0xa2, 0xd4, 0xd8, 0x2b, 0xbf, 0x89, 0x4f, + 0xc3, 0x34, 0xff, 0x95, 0x32, 0xc5, 0x5e, 0x88, 0x96, 0xba, 0x07, 0xcb, 0x31, 0xc1, 0x5c, 0xdb, + 0x32, 0x5d, 0x82, 0xaf, 0xc3, 0x8c, 0x23, 0x9e, 0xd9, 0x34, 0xb3, 0x6b, 0x0f, 0x67, 0x66, 0xde, + 0x27, 0xa2, 0x05, 0x24, 0xd4, 0xd7, 0xe0, 0xd4, 0x55, 0xa2, 0x3b, 0xde, 0x2e, 0xd1, 0xbd, 0x0e, + 0xf1, 0xfc, 0xf5, 0x7b, 0x09, 0x5a, 0x86, 0xe9, 0x7a, 0xba, 0xd9, 0x25, 0xae, 0x82, 0xd8, 0x1a, + 0x5d, 0xc8, 0x3c, 0x8d, 0x4c, 0xf0, 0xf2, 0x90, 0x8c, 0x88, 0xe9, 0x69, 0x21, 0x39, 0xb5, 0x13, + 0x9d, 0x52, 0xfc, 0xe2, 0x08, 0x95, 0xdd, 0x07, 0xe0, 0x53, 0xd8, 0xee, 0x89, 0x45, 0x94, 0x7a, + 0xd4, 0x4f, 0x10, 0x2c, 0x45, 0x05, 0xa9, 0x64, 0xbd, 0xf0, 0x8e, 0xbc, 0x30, 0xdc, 0x78, 0x1e, + 0xcb, 0x4c, 0x6f, 0x5b, 0x8c, 0xbc, 0xba, 0xab, 0xb9, 0x91, 0x25, 0x19, 0xc1, 0x7c, 0xe4, 0x5d, + 0xb9, 0xc5, 0xa0, 0xef, 0x89, 0xe3, 0x5c, 0x27, 0xae, 0xab, 0xf7, 0x89, 0x30, 0x2c, 0xa9, 0x47, + 0xdd, 0x84, 0x56, 0xc7, 0xeb, 0x70, 0x72, 0x78, 0x09, 0x1a, 0x5d, 0x6b, 0x6c, 0x7a, 0x6c, 0x9a, + 0x29, 0x8d, 0x37, 0xf0, 0x59, 0x98, 0xb5, 0xcc, 0xa1, 0x61, 0x92, 0x4d, 0xf6, 0xae, 0xc6, 0xde, + 0xc9, 0x5d, 0xaa, 0x0a, 0xd0, 0xf1, 0x7c, 0xae, 0xd3, 0xa9, 0xa8, 0xff, 0x05, 0x8d, 0x8e, 0xb7, + 0x6e, 0xdb, 0x07, 0xbc, 0xfe, 0x27, 0xa2, 0x34, 0x74, 0xcf, 0x70, 0x3d, 0xa3, 0xeb, 0xe2, 0xe7, + 0x60, 0xc6, 0x8f, 0x03, 0x42, 0x55, 0x6b, 0xd9, 0xfd, 0xd2, 0x97, 0x47, 0x0b, 0x68, 0xe0, 0xe7, + 0xa3, 0xba, 0xa2, 0x04, 0x1f, 0xc9, 0x41, 0xd0, 0x97, 0x4d, 0x52, 0x14, 0xde, 0x80, 0xba, 0x6e, + 0xdb, 0x2e, 0x5b, 0xd3, 0xd9, 0xb5, 0xd5, 0x1c, 0xd4, 0xd6, 0x6d, 0x5b, 0x63, 0x63, 0xd5, 0x77, + 0x10, 0x9c, 0xbe, 0x42, 0x7c, 0x7e, 0xdd, 0x6d, 0x73, 0xcf, 0xf2, 0xdd, 0x4e, 0x81, 0xa6, 0x65, + 0x7b, 0x86, 0x65, 0x72, 0xa7, 0x6b, 0x69, 0x7e, 0x93, 0x2e, 0xa0, 0x6e, 0xdb, 0x81, 0xb6, 0x79, + 0x83, 0x6a, 0x49, 0xcc, 0xf6, 0x9c, 0x3e, 0xf2, 0x35, 0x2d, 0x77, 0x51, 0x43, 0x62, 0x6b, 0x7d, + 0xc3, 0x1c, 0x4e, 0x94, 0xfa, 0x59, 0xf4, 0xc0, 0x8c, 0x16, 0x76, 0xa8, 0x3f, 0xad, 0xc1, 0x4a, + 0x82, 0x95, 0x6a, 0x1c, 0xa7, 0x07, 0x8b, 0xfa, 0x70, 0xe8, 0xcf, 0xb4, 0x45, 0x3c, 0xdd, 0x18, + 0xe6, 0x76, 0x20, 0x31, 0x9c, 0x8f, 0xd6, 0x92, 0x04, 0x71, 0x07, 0xc0, 0x0d, 0x0c, 0x4a, 0x68, + 0x29, 0x8f, 0xce, 0xfd, 0xa1, 0x9a, 0x44, 0x46, 0xfd, 0x0c, 0xc1, 0x89, 0xeb, 0x46, 0xd7, 0xb1, + 0xc4, 0x64, 0xcf, 0x10, 0x16, 0xb7, 0x3d, 0x62, 0xea, 0xc2, 0xa2, 0x5b, 0x9a, 0x68, 0x51, 0x0d, + 0xda, 0x8e, 0xf5, 0x2a, 0xe9, 0x7a, 0x7e, 0xa4, 0x17, 0xcd, 0x50, 0x83, 0x53, 0x87, 0x68, 0xb0, + 0x9e, 0xd4, 0xa0, 0x02, 0xcd, 0x7d, 0xe2, 0xb8, 0x86, 0x65, 0x2a, 0x0d, 0x4e, 0x51, 0x34, 0xe9, + 0x58, 0x62, 0xee, 0x1b, 0x8e, 0x65, 0xd2, 0x00, 0xaa, 0x4c, 0xf3, 0xb1, 0x52, 0x17, 0x9b, 0x73, + 0x68, 0xe8, 0xae, 0xd2, 0x14, 0x73, 0xd2, 0x86, 0xfa, 0x69, 0x13, 0xe6, 0x64, 0x79, 0x8e, 0x88, + 0x36, 0x45, 0x4d, 0x4f, 0x62, 0xbc, 0x9e, 0x60, 0xbc, 0x47, 0xdc, 0xae, 0x63, 0x30, 0xe3, 0x16, + 0x62, 0xc9, 0x5d, 0x74, 0xce, 0x21, 0xd9, 0x27, 0x43, 0x21, 0x14, 0x6f, 0xb0, 0x6d, 0x54, 0xec, + 0xdb, 0x4d, 0xee, 0x1e, 0xa2, 0x89, 0xaf, 0x41, 0xc3, 0xd6, 0xbd, 0x81, 0xab, 0x00, 0xb3, 0xa8, + 0xff, 0xcb, 0x6b, 0x51, 0x37, 0x75, 0x6f, 0xa0, 0x71, 0x12, 0x6c, 0x4b, 0xf6, 0x74, 0x6f, 0xec, + 0x2a, 0x33, 0x62, 0x4b, 0x66, 0x2d, 0x4c, 0x00, 0x6c, 0xc7, 0xb2, 0x89, 0xe3, 0x19, 0xc4, 0x55, + 0x5a, 0x6c, 0xa2, 0xcb, 0x99, 0x27, 0x92, 0x17, 0x7c, 0xf5, 0x66, 0x40, 0xe7, 0xb2, 0xe9, 0x39, + 0x13, 0x4d, 0x22, 0x4c, 0x95, 0xe1, 0x19, 0x23, 0xe2, 0x7a, 0xfa, 0xc8, 0x56, 0x66, 0xb9, 0x32, + 0x82, 0x0e, 0x7c, 0x0b, 0x5a, 0xb6, 0x63, 0xed, 0x1b, 0x3d, 0xe2, 0xb8, 0xca, 0x1c, 0xe3, 0xe1, + 0x5c, 0x21, 0x1e, 0x9e, 0x21, 0x13, 0x2d, 0x24, 0x15, 0x5a, 0xca, 0xbc, 0x64, 0x29, 0x54, 0xe4, + 0x67, 0x37, 0x3a, 0x9e, 0xa3, 0x7b, 0xa4, 0x3f, 0x51, 0x16, 0xca, 0x88, 0x1c, 0xd2, 0x11, 0x22, + 0x87, 0x1d, 0x58, 0x85, 0xb9, 0x91, 0xd5, 0xdb, 0x09, 0xa4, 0x3e, 0xc1, 0x78, 0x88, 0xf4, 0xc5, + 0x8d, 0xfd, 0x64, 0xd2, 0xd8, 0xef, 0x03, 0xe0, 0xd3, 0x13, 0x67, 0x63, 0xa2, 0x2c, 0xf2, 0x5d, + 0x2f, 0xec, 0xc1, 0x5f, 0x82, 0xd6, 0x9e, 0xa3, 0x8f, 0xc8, 0x5d, 0xcb, 0xb9, 0xa3, 0x60, 0x16, + 0x1a, 0xce, 0x67, 0x96, 0xe5, 0x69, 0x3a, 0xf2, 0xb6, 0xe5, 0xdc, 0x11, 0xaa, 0x9b, 0x68, 0x21, + 0xb1, 0xf6, 0x45, 0x38, 0x11, 0xd3, 0x28, 0x3e, 0x09, 0x53, 0x77, 0xc8, 0x44, 0x38, 0x13, 0x7d, + 0xa4, 0x2b, 0xbc, 0xaf, 0x0f, 0xc7, 0xc4, 0x77, 0x23, 0xd6, 0x38, 0x5f, 0x3b, 0x87, 0xe8, 0xf0, + 0xd8, 0xea, 0xe4, 0x19, 0xae, 0xae, 0xc3, 0x62, 0x82, 0x3b, 0x8c, 0xa1, 0x6e, 0x52, 0xbf, 0xe4, + 0x14, 0xd8, 0xb3, 0xec, 0x90, 0xb5, 0x88, 0x43, 0xaa, 0x7f, 0x45, 0x30, 0xeb, 0xef, 0x9f, 0xe3, + 0x21, 0xa1, 0x2e, 0xe0, 0x8c, 0x87, 0x61, 0x34, 0x10, 0x2d, 0x9a, 0xe3, 0xd2, 0xa7, 0x9d, 0x89, + 0xed, 0xf3, 0x11, 0xb4, 0xa9, 0xdd, 0xea, 0x9e, 0xe7, 0x18, 0xbb, 0x63, 0xcf, 0x0f, 0x07, 0x61, + 0x07, 0x8b, 0x8b, 0xba, 0xe7, 0x11, 0x27, 0x08, 0x06, 0xa2, 0x99, 0x21, 0x18, 0x44, 0x3c, 0x62, + 0x3a, 0xee, 0x11, 0x71, 0xe3, 0x69, 0x26, 0x8d, 0x47, 0x7d, 0x0f, 0xc1, 0xe9, 0xf5, 0x5e, 0xef, + 0x86, 0xf3, 0x82, 0xdd, 0xd3, 0x3d, 0x22, 0x8b, 0x2a, 0x8b, 0x84, 0x0e, 0x13, 0xa9, 0x76, 0x88, + 0x48, 0x53, 0x87, 0x8a, 0x54, 0x4f, 0x88, 0xa4, 0xfe, 0x2e, 0x5c, 0x70, 0x1a, 0x7a, 0xa8, 0xba, + 0x68, 0xf0, 0xf1, 0xd5, 0x45, 0x9f, 0xf1, 0x57, 0x61, 0x46, 0x84, 0x85, 0x89, 0xd8, 0x28, 0x37, + 0x8a, 0x84, 0x35, 0x3f, 0xd8, 0x08, 0xbf, 0x0b, 0x68, 0xb6, 0x9f, 0x80, 0xf9, 0xc8, 0xab, 0x5c, + 0x46, 0x77, 0x0e, 0x66, 0x82, 0x4c, 0x01, 0x43, 0xbd, 0x6b, 0xf5, 0xf8, 0xf2, 0x35, 0x34, 0xf6, + 0x4c, 0x17, 0x67, 0x24, 0xf2, 0x4f, 0x61, 0x6b, 0xa2, 0xa9, 0xfe, 0x05, 0xc1, 0xa9, 0x2b, 0xc4, + 0xbb, 0xfc, 0x3a, 0xf5, 0x4b, 0x9a, 0x5e, 0x89, 0xdc, 0x07, 0x43, 0xdd, 0x0b, 0x95, 0xc0, 0x9e, + 0x2b, 0xd8, 0x7a, 0x22, 0x5b, 0x5d, 0x23, 0xbe, 0xd5, 0xc9, 0x67, 0xb8, 0xe9, 0xd8, 0x19, 0x2e, + 0x16, 0x80, 0x9a, 0x89, 0x00, 0xa4, 0xfe, 0x06, 0xc1, 0x52, 0x54, 0xb2, 0x6a, 0x52, 0xa9, 0x88, + 0x0c, 0xb5, 0xc3, 0x64, 0x98, 0x3a, 0xf8, 0x1c, 0x5a, 0x8f, 0x9c, 0x43, 0xd5, 0x5f, 0x4e, 0xc1, + 0xd2, 0xa6, 0x43, 0x24, 0xe7, 0x10, 0x6a, 0xb9, 0x01, 0x4d, 0x41, 0x5b, 0xb0, 0xfe, 0x68, 0xa1, + 0xf8, 0xaf, 0xf9, 0x54, 0xf0, 0x0b, 0xd0, 0xa0, 0x0e, 0xe6, 0x9f, 0x9e, 0x2e, 0x65, 0x26, 0x97, + 0xee, 0xc0, 0x1a, 0xa7, 0x86, 0x5f, 0x86, 0xba, 0xa7, 0xf7, 0x69, 0xce, 0x47, 0xa9, 0x5e, 0xc9, + 0x4c, 0x35, 0x4d, 0xe8, 0xd5, 0x1d, 0xbd, 0x2f, 0x76, 0x66, 0x46, 0x14, 0xbf, 0x2c, 0x9f, 0x24, + 0xea, 0x6c, 0x86, 0x8b, 0x85, 0x96, 0x21, 0xe5, 0x4c, 0xd1, 0x7e, 0x1c, 0x5a, 0xc1, 0x7c, 0xb9, + 0x7c, 0xf0, 0x2d, 0x04, 0xcb, 0x31, 0xf6, 0xbf, 0x00, 0x83, 0x53, 0xaf, 0xc1, 0xd2, 0x16, 0x19, + 0x92, 0x84, 0xe5, 0x1c, 0x99, 0x55, 0xee, 0x59, 0x4e, 0x97, 0x8b, 0x35, 0xa3, 0xf1, 0x86, 0xba, + 0x07, 0xcb, 0x31, 0x5a, 0xd5, 0xc0, 0x1e, 0x0f, 0xc3, 0x62, 0x78, 0xee, 0xc9, 0xc4, 0xb0, 0xfa, + 0x6b, 0x04, 0x58, 0x1e, 0x53, 0xcd, 0x52, 0x4b, 0xee, 0x56, 0x3b, 0x0e, 0x77, 0x53, 0x97, 0x64, + 0xae, 0x7d, 0x7c, 0x4c, 0xfd, 0x98, 0x07, 0xe1, 0xb0, 0xbb, 0x1a, 0x69, 0x9e, 0x97, 0x4e, 0xf4, + 0xdc, 0xdd, 0x0b, 0x8a, 0x13, 0x90, 0x51, 0xff, 0x81, 0xe0, 0x4c, 0x24, 0x08, 0xd0, 0x3d, 0x2c, + 0x23, 0xee, 0xe7, 0x44, 0x32, 0x78, 0xce, 0x90, 0x96, 0x99, 0xa1, 0x03, 0x67, 0x3d, 0x2c, 0x9d, + 0x2f, 0x99, 0x1b, 0xaa, 0x77, 0xa0, 0x9d, 0x36, 0x6f, 0x35, 0x5e, 0xf1, 0x98, 0x0c, 0x4c, 0xd0, + 0xe0, 0xea, 0x66, 0x76, 0x8d, 0x95, 0xc4, 0xc0, 0x6a, 0x2c, 0xea, 0x5a, 0x74, 0xf7, 0xc8, 0x7d, + 0xd0, 0x93, 0xb6, 0x0c, 0xf5, 0x23, 0x04, 0x4a, 0x72, 0x3f, 0xc9, 0x64, 0x49, 0x61, 0x82, 0x5c, + 0x8b, 0x24, 0xc8, 0x1d, 0xa8, 0xd3, 0x27, 0x81, 0x3c, 0x94, 0xde, 0xdb, 0x18, 0x31, 0xf5, 0xd5, + 0x98, 0xc5, 0x73, 0x36, 0xab, 0x31, 0x81, 0xef, 0xf2, 0x4c, 0x39, 0xb7, 0x0d, 0x54, 0xb4, 0xad, + 0xab, 0x6f, 0x22, 0x58, 0x49, 0xf0, 0x53, 0x8d, 0x69, 0x29, 0xd0, 0xd4, 0x98, 0x16, 0xb9, 0x0c, + 0x2d, 0xcd, 0x6f, 0xaa, 0x1d, 0x38, 0x13, 0xdd, 0x95, 0xb2, 0x2f, 0x8b, 0x02, 0x4d, 0x27, 0x4a, + 0x54, 0x34, 0xa9, 0x67, 0xa7, 0x11, 0xad, 0x46, 0xad, 0x8f, 0xc2, 0x72, 0xe8, 0xa0, 0x34, 0xdb, + 0xc8, 0xe6, 0xd8, 0xff, 0x8a, 0x40, 0x95, 0x7c, 0x5c, 0x35, 0x8b, 0xff, 0x15, 0x91, 0xbe, 0x71, + 0xeb, 0xd9, 0xce, 0x4c, 0x2a, 0x9d, 0xbb, 0x78, 0x02, 0x57, 0x3c, 0xc7, 0x7a, 0x05, 0x56, 0x22, + 0xb6, 0xb9, 0xa3, 0xf7, 0xb3, 0x29, 0x5e, 0x4c, 0x52, 0x4b, 0x99, 0x64, 0x4a, 0x9a, 0x44, 0x35, + 0x62, 0x31, 0x88, 0x4d, 0x50, 0x8d, 0x11, 0x7c, 0x8a, 0x60, 0x39, 0xf4, 0xa5, 0xcc, 0x56, 0x80, + 0xbf, 0x1c, 0xd1, 0xcd, 0xd5, 0x3c, 0x9e, 0x9d, 0x9c, 0xeb, 0xf8, 0x54, 0xd3, 0x97, 0x23, 0x55, + 0x85, 0xb6, 0xa9, 0x3e, 0x0b, 0x4a, 0xc4, 0x53, 0xb3, 0xaf, 0x1c, 0x86, 0xfa, 0x1d, 0x32, 0xf1, + 0x5d, 0x9f, 0x3d, 0xd3, 0x68, 0x9e, 0x42, 0xad, 0x1a, 0xce, 0x27, 0x30, 0x7b, 0x95, 0xe8, 0x43, + 0x6f, 0xb0, 0x39, 0x20, 0xdd, 0x3b, 0x94, 0x9d, 0x91, 0x7f, 0x50, 0x6f, 0x69, 0xec, 0x99, 0x21, + 0x0f, 0x96, 0xc3, 0xd1, 0xea, 0x86, 0xc6, 0x9e, 0xe9, 0x11, 0xd2, 0x30, 0x3d, 0xe2, 0xec, 0xeb, + 0x43, 0x66, 0xac, 0x0d, 0x2d, 0x68, 0x53, 0x7d, 0x30, 0xec, 0x85, 0x1d, 0x20, 0x1b, 0x1a, 0x6f, + 0x50, 0xbd, 0x8d, 0x9d, 0xa1, 0x38, 0x50, 0xd3, 0x47, 0xf5, 0xef, 0x75, 0x58, 0x4a, 0x3b, 0xf9, + 0xc4, 0x2e, 0xaf, 0x50, 0xe2, 0xf2, 0xea, 0xf0, 0xd3, 0xed, 0xbd, 0xd0, 0x22, 0x66, 0xcf, 0xb6, + 0x0c, 0xd3, 0xe3, 0x67, 0xbd, 0x96, 0x16, 0x76, 0x50, 0xc6, 0x07, 0x96, 0xeb, 0x49, 0x50, 0x7a, + 0xd0, 0x96, 0x60, 0xdd, 0x46, 0x04, 0xd6, 0x1d, 0x45, 0x92, 0xc2, 0x69, 0x66, 0xe3, 0xd7, 0x4b, + 0x1d, 0xee, 0x0e, 0x85, 0x77, 0x6f, 0xc1, 0xec, 0x20, 0x54, 0x09, 0x83, 0x11, 0xf2, 0xa4, 0x31, + 0x92, 0x3a, 0x35, 0x99, 0x50, 0x14, 0x24, 0x9b, 0x89, 0x83, 0x64, 0xaf, 0xc0, 0x42, 0x4f, 0xf7, + 0xf4, 0x4d, 0x42, 0xd5, 0xb8, 0x6d, 0xee, 0x59, 0x4a, 0x8b, 0x4d, 0xfc, 0x78, 0xe6, 0x89, 0xb7, + 0x22, 0xc3, 0xb5, 0x18, 0xb9, 0x04, 0x0a, 0x07, 0x29, 0x10, 0xae, 0x84, 0xca, 0xcc, 0x46, 0x50, + 0x99, 0xb2, 0x49, 0xf2, 0x2e, 0x2c, 0x44, 0xd9, 0x4b, 0x85, 0x3f, 0x69, 0xce, 0x46, 0xfa, 0x21, + 0xfa, 0x29, 0x5a, 0xf8, 0x7e, 0x98, 0xd7, 0xf7, 0x75, 0x63, 0xa8, 0xef, 0x0e, 0xc9, 0x4b, 0x96, + 0xe9, 0xc7, 0xe7, 0x68, 0xa7, 0x7a, 0x1b, 0x56, 0xd2, 0x74, 0xfd, 0x0c, 0x99, 0x94, 0xb3, 0x68, + 0xd5, 0x83, 0x15, 0x4d, 0x80, 0xd4, 0x01, 0x3a, 0x20, 0x82, 0xcb, 0x8b, 0xd4, 0x0f, 0x79, 0x97, + 0x88, 0x06, 0x25, 0x51, 0x87, 0x80, 0x9c, 0xfa, 0x2d, 0x04, 0x4a, 0x72, 0xda, 0x6a, 0xf6, 0xf6, + 0xa3, 0xee, 0xee, 0x5f, 0x84, 0x33, 0x2f, 0x98, 0xce, 0x01, 0x6b, 0x50, 0xae, 0x2c, 0x80, 0x1e, + 0x9f, 0x52, 0x48, 0x57, 0x13, 0x6d, 0x6f, 0xc2, 0xc9, 0xa0, 0x04, 0xe1, 0x78, 0xd8, 0xdf, 0x85, + 0x45, 0x89, 0x62, 0x35, 0x5c, 0xff, 0x0a, 0xc1, 0xd2, 0xd3, 0x86, 0xd9, 0xf3, 0x57, 0x27, 0xd8, + 0xda, 0x1e, 0x84, 0xc5, 0xae, 0x65, 0xba, 0xe3, 0x11, 0x71, 0x3a, 0x31, 0x11, 0x92, 0x2f, 0x0a, + 0x43, 0xb5, 0x67, 0x61, 0x56, 0x44, 0x01, 0x9a, 0x00, 0xfb, 0x58, 0xb9, 0xd4, 0xc5, 0x80, 0x61, + 0x9a, 0x7e, 0x34, 0xf8, 0x26, 0x4a, 0x9f, 0xd5, 0x3f, 0x22, 0x58, 0x8e, 0x31, 0x5d, 0x8d, 0xed, + 0xbe, 0x9c, 0xac, 0xf7, 0x38, 0x36, 0xe4, 0x4f, 0xfd, 0x18, 0xb1, 0xb4, 0xfc, 0x86, 0x49, 0xe2, + 0x56, 0x9f, 0x6f, 0xed, 0x1f, 0x84, 0x45, 0xff, 0x26, 0xaf, 0x13, 0x0b, 0x34, 0xc9, 0x17, 0x78, + 0x15, 0xb0, 0xdf, 0xb9, 0x1d, 0x1a, 0x1f, 0x57, 0x4d, 0xca, 0x9b, 0x60, 0xfd, 0xeb, 0xd2, 0xfa, + 0xff, 0x81, 0x1f, 0x0c, 0x22, 0x9c, 0x57, 0xa3, 0x00, 0x39, 0x06, 0xd6, 0x8e, 0x37, 0x06, 0xbe, + 0xcd, 0x41, 0xb0, 0x92, 0x86, 0x9f, 0x6f, 0xf1, 0xb1, 0x04, 0x53, 0x4b, 0x8b, 0xb9, 0x14, 0xe5, + 0xe3, 0x3f, 0xd0, 0x96, 0x5d, 0xb8, 0x87, 0x9f, 0x63, 0xfc, 0x97, 0x1d, 0x96, 0x5e, 0x1d, 0x4b, + 0x1c, 0x94, 0x72, 0xb7, 0x29, 0x39, 0x77, 0x53, 0x47, 0x70, 0x6f, 0xfa, 0xa4, 0xd5, 0x84, 0xca, + 0xf7, 0x6a, 0x3e, 0x1a, 0xe7, 0xcf, 0x97, 0x03, 0x7c, 0x3c, 0x4a, 0x46, 0x37, 0x92, 0x87, 0xf2, + 0x6b, 0x8c, 0x4e, 0x4e, 0x70, 0x32, 0x8d, 0xad, 0x2a, 0xd1, 0xc9, 0x61, 0x5c, 0xe9, 0x95, 0xc2, + 0x93, 0x17, 0x60, 0xe9, 0xb6, 0xee, 0x75, 0x07, 0xf1, 0x60, 0x79, 0x3f, 0xcc, 0xbb, 0x64, 0xb8, + 0x17, 0xf7, 0xd5, 0x68, 0xa7, 0xfa, 0x51, 0x0d, 0x96, 0x63, 0xc3, 0xab, 0x71, 0xb3, 0xd3, 0x30, + 0xad, 0x77, 0x3d, 0x29, 0xcf, 0xe4, 0x2d, 0x7c, 0x8d, 0x2f, 0x2c, 0x87, 0x06, 0x8b, 0x17, 0x6d, + 0x30, 0x95, 0xc8, 0x51, 0xb1, 0x7e, 0xbc, 0x51, 0xf1, 0x59, 0x38, 0x79, 0x85, 0x78, 0xa2, 0xce, + 0x35, 0x93, 0x65, 0xcb, 0x37, 0x8e, 0xb5, 0xe8, 0x8d, 0xa3, 0xda, 0x61, 0x21, 0x76, 0x7d, 0x38, + 0xcc, 0x43, 0xf0, 0x3e, 0x80, 0xbb, 0x86, 0x37, 0xe0, 0x43, 0xc4, 0x05, 0x91, 0xd4, 0xa3, 0xfe, + 0x18, 0xf1, 0xeb, 0x1b, 0x41, 0xb2, 0x32, 0x35, 0xba, 0x21, 0x03, 0x41, 0x65, 0x2e, 0xb3, 0x36, + 0xf6, 0xd4, 0x11, 0x37, 0xa9, 0xe2, 0xb8, 0x10, 0xe9, 0x54, 0x7f, 0xc1, 0x63, 0xba, 0x24, 0x78, + 0x35, 0x5c, 0x1e, 0x63, 0x29, 0xf3, 0x0d, 0x38, 0x25, 0x80, 0x89, 0x63, 0xd2, 0x3d, 0x09, 0x2e, + 0x06, 0xab, 0x5c, 0x02, 0xf5, 0x0d, 0x04, 0xa7, 0xe4, 0x5a, 0xe9, 0xd2, 0x8c, 0x1f, 0x54, 0x94, + 0x7d, 0xc8, 0xf5, 0x39, 0x89, 0xd6, 0xa1, 0x57, 0x87, 0xe7, 0x9c, 0x5e, 0xef, 0xf5, 0xb6, 0x88, + 0x4d, 0xcc, 0x1e, 0x31, 0xbb, 0x46, 0x98, 0xb3, 0xbc, 0x02, 0x73, 0x3d, 0xa9, 0x5b, 0xd4, 0x6c, + 0x3f, 0x91, 0xfd, 0x1a, 0x5c, 0xe4, 0x35, 0x01, 0xed, 0x89, 0x16, 0x21, 0xa8, 0x0e, 0x18, 0x0e, + 0x1f, 0x9d, 0xba, 0x1a, 0x21, 0xbf, 0x06, 0x67, 0xf8, 0xad, 0xf6, 0x17, 0x22, 0xe7, 0xdf, 0x10, + 0xe0, 0xe4, 0x8f, 0xf0, 0x0e, 0xcc, 0xf8, 0xa9, 0x9f, 0x90, 0xb1, 0x78, 0x04, 0x0f, 0x28, 0x45, + 0xab, 0xf9, 0x6a, 0xc7, 0x57, 0xcd, 0xd7, 0x86, 0x19, 0x6b, 0x9f, 0x38, 0x8e, 0xd1, 0xe3, 0x67, + 0xae, 0x19, 0x2d, 0x68, 0xd3, 0x23, 0x71, 0xda, 0xf2, 0x56, 0xa3, 0x4b, 0x93, 0x1d, 0x13, 0xd2, + 0x14, 0x79, 0xe4, 0x0e, 0xe0, 0xea, 0x23, 0xb2, 0x65, 0x8d, 0x74, 0xc3, 0xf4, 0x77, 0x80, 0xb0, + 0x87, 0x7a, 0xa8, 0x69, 0x75, 0xc8, 0x70, 0x4f, 0x88, 0x27, 0x5a, 0xea, 0xef, 0x11, 0xb4, 0xaf, + 0x10, 0x6f, 0xd3, 0x32, 0x3f, 0x07, 0xe9, 0x70, 0x27, 0xa9, 0xbe, 0x82, 0xf7, 0xdb, 0x21, 0x1d, + 0x5f, 0x84, 0x9b, 0x8e, 0xf5, 0x39, 0x89, 0xe0, 0x5b, 0x63, 0x59, 0x11, 0x02, 0x3a, 0xea, 0x4f, + 0xa6, 0x61, 0x3e, 0x52, 0xaa, 0x8d, 0x5f, 0x84, 0xb9, 0x91, 0xf4, 0xe3, 0x72, 0xa5, 0x44, 0x11, + 0x52, 0x95, 0x9e, 0x6a, 0xf0, 0xf3, 0x30, 0x2b, 0x76, 0x05, 0x73, 0xcf, 0xf2, 0xb3, 0xf2, 0xdc, + 0x5b, 0xac, 0x4c, 0x23, 0xbc, 0xc1, 0xae, 0x97, 0xbe, 0xc1, 0x8e, 0x1a, 0x60, 0xe3, 0x78, 0x0c, + 0x30, 0x6a, 0x12, 0xd3, 0xc7, 0x63, 0x12, 0x78, 0x47, 0x9c, 0x7b, 0x9b, 0x8c, 0xde, 0x53, 0xc5, + 0x2a, 0xfe, 0x13, 0x75, 0x59, 0x6b, 0xb0, 0x24, 0xdb, 0xc2, 0x2d, 0x8e, 0x1a, 0xb9, 0xca, 0x0c, + 0x3b, 0x5d, 0xa7, 0xbe, 0xc3, 0xd7, 0xa1, 0xc9, 0x6a, 0xfb, 0xbb, 0xae, 0xc0, 0xc0, 0x0b, 0xfd, + 0x7f, 0x80, 0x4f, 0xa3, 0xf8, 0xf5, 0xd5, 0x27, 0x08, 0x94, 0xf0, 0xf6, 0x52, 0xfc, 0x4b, 0x43, + 0x45, 0x5e, 0x7e, 0x33, 0x5e, 0x55, 0x54, 0xf4, 0x5f, 0x2e, 0x82, 0xb2, 0xa2, 0x6b, 0x80, 0xb7, + 0xc8, 0x30, 0x56, 0x56, 0xc4, 0xc2, 0xb6, 0x1f, 0xc3, 0xfd, 0x7f, 0x61, 0x91, 0x7a, 0x0e, 0x28, + 0xfa, 0xd2, 0xa2, 0xb4, 0x5c, 0x9b, 0x41, 0xf8, 0xd1, 0x7f, 0x62, 0x42, 0xf1, 0x7f, 0x62, 0x3a, + 0x02, 0x55, 0xff, 0x2d, 0x62, 0xd9, 0x6c, 0xd5, 0x05, 0x4e, 0xb7, 0x13, 0x05, 0x4e, 0xd9, 0x53, + 0x91, 0xa4, 0xcc, 0x52, 0x99, 0xd3, 0x1a, 0x2c, 0xd0, 0xe3, 0x83, 0x1d, 0xa2, 0x0b, 0xb1, 0xfa, + 0x53, 0x94, 0xac, 0x3f, 0x7d, 0x1d, 0x4e, 0x04, 0x63, 0xaa, 0x3b, 0xda, 0xda, 0x76, 0x58, 0xcc, + 0x20, 0x5a, 0x6b, 0x7f, 0xbe, 0x27, 0x28, 0x67, 0xde, 0xf4, 0x9c, 0x21, 0x7e, 0x0b, 0x41, 0x83, + 0xbc, 0x6e, 0xb8, 0x1e, 0xbe, 0x90, 0xe7, 0x26, 0x3f, 0x5e, 0x13, 0xdc, 0xbe, 0x58, 0x70, 0xb4, + 0x60, 0xf7, 0x9b, 0x08, 0xa6, 0xbb, 0x2c, 0xd7, 0xc1, 0x17, 0x4b, 0x15, 0x84, 0xb6, 0x9f, 0x2c, + 0x3a, 0x5c, 0xe2, 0xa4, 0xc7, 0xce, 0x42, 0x39, 0x38, 0x49, 0xab, 0xaa, 0xcc, 0xc1, 0x49, 0x7a, + 0x21, 0xe5, 0x1b, 0x08, 0xa6, 0xfb, 0x0c, 0xb9, 0xc5, 0xe7, 0x0b, 0x54, 0x59, 0xf8, 0x6c, 0x3c, + 0x51, 0x68, 0xac, 0xe0, 0xe1, 0x1d, 0x04, 0xb3, 0xfd, 0xb0, 0xfa, 0x10, 0x17, 0x21, 0xe6, 0xfb, + 0x45, 0xfb, 0x42, 0xb1, 0xc1, 0x82, 0x95, 0x0f, 0x11, 0x9c, 0x1c, 0x33, 0x08, 0x2b, 0xc4, 0xc1, + 0xf0, 0x46, 0xf9, 0x9a, 0xc0, 0xf6, 0x66, 0x29, 0x1a, 0x82, 0xbb, 0xef, 0x20, 0x68, 0xea, 0xbd, + 0x1e, 0xbb, 0x06, 0xb9, 0x54, 0xa0, 0xee, 0x42, 0x2e, 0x54, 0x6a, 0x3f, 0x55, 0x9c, 0x80, 0xc4, + 0x4e, 0x9f, 0x78, 0x39, 0xd9, 0x49, 0x2f, 0x29, 0xcc, 0xc1, 0xce, 0x41, 0xa5, 0x85, 0xdf, 0x47, + 0x00, 0x5c, 0x77, 0x8c, 0xa3, 0xf5, 0x62, 0x2b, 0x2e, 0x15, 0xfd, 0xb5, 0x37, 0xca, 0x90, 0x10, + 0x5c, 0xfd, 0x10, 0x01, 0x70, 0x57, 0x67, 0x5c, 0x6d, 0x14, 0xf4, 0x57, 0x79, 0xa9, 0x36, 0x4b, + 0xd1, 0x10, 0x7c, 0x7d, 0x9b, 0xdb, 0x12, 0x4d, 0x56, 0xf0, 0x93, 0xe5, 0x6a, 0x78, 0xda, 0x97, + 0x0a, 0x8f, 0x97, 0x98, 0xe9, 0x13, 0x2f, 0x27, 0x33, 0xa9, 0x25, 0x6c, 0xed, 0x4b, 0x25, 0x8b, + 0xc5, 0xf0, 0xf7, 0x10, 0xb4, 0xb8, 0x1d, 0xed, 0xe8, 0x7d, 0xfc, 0x54, 0x31, 0x1b, 0x08, 0x0b, + 0xc3, 0xda, 0xeb, 0x25, 0x28, 0x48, 0xa6, 0xcd, 0x8d, 0x88, 0x2d, 0xd1, 0x7a, 0x31, 0x03, 0x90, + 0x57, 0x69, 0xa3, 0x0c, 0x09, 0xc1, 0xd5, 0x37, 0x10, 0xcc, 0xf7, 0x7d, 0xdc, 0x95, 0x25, 0x69, + 0xff, 0x9f, 0x6b, 0xed, 0x65, 0x78, 0xae, 0x7d, 0xbe, 0xc8, 0x50, 0xc1, 0xc8, 0xfb, 0x08, 0x4e, + 0xf6, 0x25, 0x74, 0x95, 0xf1, 0x92, 0x6b, 0x23, 0x88, 0x23, 0xd2, 0xf9, 0x52, 0x8d, 0x24, 0xac, + 0xfb, 0x2e, 0x82, 0xb9, 0x9e, 0x04, 0x76, 0xe6, 0xe0, 0x26, 0x05, 0x74, 0x6d, 0x5f, 0x2c, 0x38, + 0x5a, 0xe2, 0x66, 0x24, 0xe1, 0x91, 0x39, 0xb8, 0x49, 0x41, 0x52, 0x73, 0x70, 0x93, 0x0a, 0x82, + 0xbe, 0x87, 0x60, 0x5e, 0xe6, 0xc6, 0xc5, 0xc5, 0x08, 0xba, 0xf9, 0x73, 0xa0, 0xf4, 0x6f, 0x68, + 0xfc, 0x0c, 0xc1, 0x7f, 0xeb, 0x51, 0x30, 0xf3, 0x69, 0xcb, 0x91, 0x8f, 0xae, 0x6e, 0xbe, 0xed, + 0x36, 0x05, 0xe0, 0xca, 0xb7, 0xdd, 0xa6, 0x42, 0x3d, 0x3f, 0x47, 0xa0, 0x76, 0x13, 0x50, 0x5d, + 0x82, 0xd3, 0x8d, 0x9c, 0xb9, 0x69, 0x1a, 0xb3, 0x9b, 0xa5, 0x68, 0x08, 0x7e, 0x7f, 0x84, 0x60, + 0xa5, 0xcf, 0x90, 0x2b, 0x86, 0x24, 0xc8, 0xbf, 0xc9, 0x97, 0x2e, 0x94, 0xe3, 0xf0, 0x10, 0xf0, + 0x4c, 0x70, 0x98, 0xc0, 0x77, 0x3f, 0x7f, 0x0e, 0x0f, 0x42, 0x28, 0xdf, 0x45, 0xb0, 0xd0, 0x93, + 0x03, 0x70, 0x9e, 0xec, 0x38, 0x79, 0x22, 0x6f, 0x5f, 0x28, 0x36, 0x98, 0x73, 0xb3, 0xf6, 0xd9, + 0x2c, 0x9c, 0x8a, 0xa1, 0x63, 0xec, 0x7c, 0xf7, 0x3e, 0xa2, 0xe7, 0x4a, 0x5e, 0x55, 0x95, 0x63, + 0xc3, 0x3c, 0xa0, 0xce, 0x2d, 0xc7, 0x86, 0x79, 0x60, 0xc9, 0x1a, 0xcd, 0xba, 0xc6, 0x41, 0xa5, + 0x57, 0x9e, 0x0c, 0xfe, 0xa0, 0xca, 0xb3, 0x3c, 0x19, 0xfc, 0xc1, 0x25, 0x66, 0x6f, 0x22, 0x68, + 0x0d, 0xfc, 0x12, 0xae, 0x1c, 0xdb, 0x65, 0xbc, 0x90, 0x2c, 0xc7, 0x76, 0x99, 0xac, 0x18, 0x7b, + 0x1b, 0x41, 0x7d, 0xcf, 0x30, 0x7b, 0x39, 0xe2, 0x6e, 0x5a, 0x45, 0x58, 0x8e, 0xb8, 0x9b, 0x5e, + 0x9b, 0x45, 0xb7, 0xa5, 0xbe, 0x54, 0xe8, 0x92, 0x6f, 0xcb, 0x4e, 0xb0, 0x73, 0xb1, 0xe0, 0x68, + 0xc1, 0xcd, 0x07, 0x08, 0x16, 0xfa, 0x91, 0x1a, 0xa6, 0x7c, 0xa9, 0x68, 0xb2, 0x6c, 0x2b, 0x5f, + 0x2a, 0x9a, 0x56, 0x3c, 0xf5, 0x21, 0x82, 0x39, 0x9e, 0x8a, 0xf2, 0x4a, 0x16, 0xbc, 0x55, 0xb0, + 0x02, 0x24, 0x52, 0x7d, 0xd3, 0xbe, 0x5c, 0x92, 0x8a, 0xe0, 0xee, 0x23, 0x04, 0xca, 0x38, 0x51, + 0xef, 0x21, 0x0e, 0xcd, 0x9b, 0xc7, 0x50, 0xab, 0xd2, 0xde, 0x2a, 0x47, 0x24, 0xc4, 0x17, 0x1a, + 0x77, 0x75, 0xaf, 0x3b, 0xc8, 0x61, 0xf0, 0x69, 0x95, 0x25, 0x39, 0x0c, 0x3e, 0xb5, 0xb2, 0xe4, + 0x21, 0xc4, 0x4c, 0x7e, 0x20, 0x7d, 0x97, 0x0a, 0x17, 0xfb, 0x8c, 0x56, 0x7e, 0x93, 0x4f, 0xfb, + 0x18, 0xd6, 0xda, 0x9f, 0xa6, 0x60, 0xf1, 0x8a, 0xb5, 0x4f, 0x1c, 0x53, 0x46, 0xeb, 0x3e, 0xe0, + 0xd9, 0x74, 0xf4, 0xc6, 0xa6, 0x0c, 0x38, 0xb4, 0x5e, 0x60, 0x6c, 0x0c, 0x00, 0xff, 0x01, 0x82, + 0x13, 0xfd, 0xe8, 0x97, 0x89, 0x0a, 0x41, 0x0e, 0xf2, 0xe7, 0x95, 0x0a, 0x41, 0x0e, 0xd1, 0x8f, + 0x22, 0xbd, 0xc5, 0xd9, 0x5a, 0xb7, 0xed, 0xa1, 0xd1, 0xd5, 0xf9, 0xa7, 0x99, 0x1e, 0xcf, 0x75, + 0x72, 0x08, 0x11, 0xdd, 0xf6, 0xb9, 0xfc, 0x03, 0x39, 0x1b, 0x1b, 0x0f, 0x41, 0xd6, 0x2f, 0xe4, + 0xbd, 0xd4, 0x60, 0x5f, 0xd4, 0xdb, 0x9d, 0x66, 0x7f, 0x1e, 0xf9, 0x77, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x8a, 0xd7, 0xf3, 0xfc, 0x6a, 0x4f, 0x00, 0x00, } diff --git a/server/core/proto/services.proto b/server/core/proto/services.proto index 4711494b..75a79efa 100644 --- a/server/core/proto/services.proto +++ b/server/core/proto/services.proto @@ -502,7 +502,7 @@ message GetSchemaResponse { message GetAllSchemaResponse { Response response = 1; - repeated Schema schema = 2; + repeated Schema schemas = 2; } message DeleteSchemaRequest { diff --git a/server/plugin/infra/registry/etcd/etcd.go b/server/plugin/infra/registry/etcd/etcd.go index bfe7ea6c..85227827 100644 --- a/server/plugin/infra/registry/etcd/etcd.go +++ b/server/plugin/infra/registry/etcd/etcd.go @@ -29,7 +29,6 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/pkg/capnslog" "golang.org/x/net/context" "google.golang.org/grpc" "strings" @@ -46,9 +45,7 @@ var ( ) func init() { - l := &clientLogger{} - capnslog.SetFormatter(l) - clientv3.SetLogger(l) + clientv3.SetLogger(&clientLogger{}) mgr.RegisterPlugin(mgr.Plugin{mgr.REGISTRY, "etcd", NewRegistry}) } diff --git a/server/plugin/infra/registry/etcd/logger.go b/server/plugin/infra/registry/etcd/logger.go index 46fe7413..952834bc 100644 --- a/server/plugin/infra/registry/etcd/logger.go +++ b/server/plugin/infra/registry/etcd/logger.go @@ -20,6 +20,8 @@ import ( "fmt" "github.com/apache/incubator-servicecomb-service-center/pkg/util" "github.com/coreos/pkg/capnslog" + "runtime" + "strings" ) // clientLogger implement from grcplog.LoggerV2s and capnslog.Formatter @@ -27,23 +29,31 @@ type clientLogger struct { } func (l *clientLogger) Format(pkg string, level capnslog.LogLevel, depth int, entries ...interface{}) { + fmt := "\b" + l.getCaller(depth) + " " + pkg + " %s" switch level { - case capnslog.CRITICAL: - l.Fatalf(pkg+": %s", entries...) - case capnslog.ERROR: - l.Errorf(pkg+": %s", entries...) - case capnslog.WARNING: - l.Warningf(pkg+": %s", entries...) - case capnslog.NOTICE, capnslog.INFO: - l.Infof(pkg+": %s", entries...) - case capnslog.DEBUG, capnslog.TRACE: - return + case capnslog.CRITICAL, capnslog.ERROR, capnslog.WARNING, capnslog.INFO: + l.Errorf(fmt, entries...) + case capnslog.NOTICE, capnslog.DEBUG, capnslog.TRACE: default: return } l.Flush() } +func (l *clientLogger) getCaller(depth int) string { + _, file, line, ok := runtime.Caller(depth + 4) + if !ok { + return "???" + } + + if sp1 := strings.LastIndex(file, "/"); sp1 >= 0 { + if sp2 := strings.LastIndex(file[:sp1], "/"); sp2 >= 0 { + file = file[sp2+1:] + } + } + return fmt.Sprintf("%s:%d", file, line) +} + func (l *clientLogger) Flush() { } diff --git a/server/service/schema.go b/server/service/schema.go index 107575f4..3d7da42f 100644 --- a/server/service/schema.go +++ b/server/service/schema.go @@ -125,7 +125,7 @@ func (s *MicroServiceService) GetAllSchemaInfo(ctx context.Context, in *pb.GetAl util.Logger().Infof("service %s schemaId set is empty.", in.ServiceId) return &pb.GetAllSchemaResponse{ Response: pb.CreateResponse(pb.Response_SUCCESS, "Do not have this schema info."), - Schema: []*pb.Schema{}, + Schemas: []*pb.Schema{}, }, nil } @@ -174,7 +174,7 @@ func (s *MicroServiceService) GetAllSchemaInfo(ctx context.Context, in *pb.GetAl return &pb.GetAllSchemaResponse{ Response: pb.CreateResponse(pb.Response_SUCCESS, "Get all schema info successfully."), - Schema: schemas, + Schemas: schemas, }, nil } diff --git a/server/service/schema_test.go b/server/service/schema_test.go index da7a799b..0b73d299 100644 --- a/server/service/schema_test.go +++ b/server/service/schema_test.go @@ -903,7 +903,7 @@ var _ = Describe("'Schema' service", func() { }) Expect(err).To(BeNil()) Expect(respGetAllSchema.Response.Code).To(Equal(pb.Response_SUCCESS)) - schemas := respGetAllSchema.Schema + schemas := respGetAllSchema.Schemas for _, schema := range schemas { if schema.SchemaId == schemaId1 { Expect(schema.Summary).To(BeEmpty()) @@ -925,7 +925,7 @@ var _ = Describe("'Schema' service", func() { }) Expect(err).To(BeNil()) Expect(respGetAllSchema.Response.Code).To(Equal(pb.Response_SUCCESS)) - schemas = respGetAllSchema.Schema + schemas = respGetAllSchema.Schemas for _, schema := range schemas { if schema.SchemaId == schemaId1 { Expect(schema.Schema).To(BeEmpty()) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services