Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/action.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ func (refOpts *ReferenceOptions) refer(srv common.RPCService, info *ClientInfo)
common.WithParams(refOpts.getURLMap()),
common.WithParamsValue(constant.BeanNameKey, refOpts.id),
common.WithParamsValue(constant.MetadataTypeKey, refOpts.metaDataType),
common.WithParamsValue(constant.TimeoutKey, refOpts.Consumer.RequestTimeout),
)
if info != nil {
cfgURL.SetAttribute(constant.ClientInfoKey, info)
Expand Down
3 changes: 2 additions & 1 deletion protocol/dubbo/dubbo_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ import (
)

var attachmentKey = []string{
constant.InterfaceKey, constant.GroupKey, constant.TokenKey, constant.TimeoutKey,
constant.InterfaceKey, constant.GroupKey, constant.TokenKey,
//constant.TimeoutKey,
constant.VersionKey,
}

Expand Down
2 changes: 1 addition & 1 deletion protocol/dubbo/hessian2/hessian_dubbo.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func NewHessianCodec(reader *bufio.Reader) *HessianCodec {
}
}

// NewHessianCodec generate a new hessian codec instance
// NewHessianCodecCustom generate a new hessian codec instance
func NewHessianCodecCustom(pkgType PackageType, reader *bufio.Reader, bodyLen int) *HessianCodec {
return &HessianCodec{
pkgType: pkgType,
Expand Down
2 changes: 1 addition & 1 deletion protocol/dubbo/impl/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type ResponsePayload struct {
Attachments map[string]interface{}
}

// NewResponse create a new ResponsePayload
// NewResponsePayload create a new ResponsePayload
func NewResponsePayload(rspObj interface{}, exception error, attachments map[string]interface{}) *ResponsePayload {
if attachments == nil {
attachments = make(map[string]interface{})
Expand Down
2 changes: 1 addition & 1 deletion protocol/dubbo3/dubbo3_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func NewDubboExporter(key string, invoker protocol.Invoker, exporterMap *sync.Ma
}
}

// Unexport unexport dubbo3 service exporter.
// UnExport unexport dubbo3 service exporter.
func (de *DubboExporter) UnExport() {
url := de.GetInvoker().GetURL()
interfaceName := url.GetParam(constant.InterfaceKey, "")
Expand Down
4 changes: 2 additions & 2 deletions protocol/grpc/internal/routeguide/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func init() {
config.SetConsumerService(&RouteGuideClientImpl{})
}

// printFeatures lists all the features within the given bounding Rectangle.
// PrintFeatures lists all the features within the given bounding Rectangle.
func PrintFeatures(stream RouteGuide_ListFeaturesClient) {
for {
feature, err := stream.Recv()
Expand All @@ -51,7 +51,7 @@ func PrintFeatures(stream RouteGuide_ListFeaturesClient) {
}
}

// runRecordRoute sends a sequence of points to server and expects to get a RouteSummary from server.
// RunRecordRoute sends a sequence of points to server and expects to get a RouteSummary from server.
func RunRecordRoute(stream RouteGuide_RecordRouteClient) {
// Create a random number of random points
r := rand.New(rand.NewSource(time.Now().UnixNano()))
Expand Down
2 changes: 1 addition & 1 deletion protocol/jsonrpc/jsonrpc_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func NewJsonrpcExporter(key string, invoker protocol.Invoker, exporterMap *sync.
}
}

// Unexport exported JSON RPC service.
// UnExport exported JSON RPC service.
func (je *JsonrpcExporter) UnExport() {
interfaceName := je.GetInvoker().GetURL().GetParam(constant.InterfaceKey, "")
err := common.ServiceMap.UnRegister(interfaceName, JSONRPC, je.GetInvoker().GetURL().ServiceKey())
Expand Down
2 changes: 1 addition & 1 deletion protocol/rest/rest_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func NewRestExporter(key string, invoker protocol.Invoker, exporterMap *sync.Map
}
}

// Unexport unexport the RestExporter
// UnExport unexport the RestExporter
func (re *RestExporter) UnExport() {
interfaceName := re.GetInvoker().GetURL().GetParam(constant.InterfaceKey, "")
err := common.ServiceMap.UnRegister(interfaceName, REST, re.GetInvoker().GetURL().ServiceKey())
Expand Down
4 changes: 2 additions & 2 deletions protocol/triple/internal/client/common/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func testBidiStream(cli greettriple.GreetService) error {
return err
}
if sendErr := stream.Send(&greet.GreetStreamRequest{Name: "triple"}); sendErr != nil {
return err
return sendErr
}
resp, err := stream.Recv()
if err != nil {
Expand All @@ -89,7 +89,7 @@ func testClientStream(cli greettriple.GreetService) error {
}
for i := 0; i < 5; i++ {
if sendErr := stream.Send(&greet.GreetClientStreamRequest{Name: "triple"}); sendErr != nil {
return err
return sendErr
}
}
resp, err := stream.CloseAndRecv()
Expand Down
2 changes: 1 addition & 1 deletion registry/etcdv3/service_discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ func (e *etcdV3ServiceDiscovery) DataChange(eventType remoting.Event) bool {
return true
}

// newEtcdv3ServiceDiscovery
// newEtcdV3ServiceDiscovery
func newEtcdV3ServiceDiscovery(url *common.URL) (registry.ServiceDiscovery, error) {
initLock.Lock()
defer initLock.Unlock()
Expand Down
2 changes: 1 addition & 1 deletion xds/credentials/certgenerate/generate_cert.go
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ func genCertTemplateFromCSR(csr *x509.CertificateRequest, subjectIDs []string, t
}, nil
}

// genCertTemplateFromoptions generates a certificate template with the given options.
// genCertTemplateFromOptions generates a certificate template with the given options.
func genCertTemplateFromOptions(options CertOptions) (*x509.Certificate, error) {
var keyUsage x509.KeyUsage
if options.IsCA {
Expand Down
Loading