Skip to content

Commit

Permalink
Change server version string to 6.0.0 (#37)
Browse files Browse the repository at this point in the history
* Update server version string

* fix Errorf call errors

* fix Errorf call errors
  • Loading branch information
pallavidn authored Dec 7, 2017
1 parent 72f1a7a commit 32eb95b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions pkg/mediationcontainer/client_protobuf_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (endpoint *ClientProtobufEndpoint) Send(messageToSend *EndpointMessage) {
// Marshal protobuf message to raw bytes
msgMarshalled, err := goproto.Marshal(messageToSend.ProtobufMessage) // marshal to byte array
if err != nil {
glog.Errorf("[ClientProtobufEndpoint] during send - marshaling error: ", err)
glog.Errorf("[ClientProtobufEndpoint] during send - marshaling error: %s", err)
return
}
// Send using the underlying transport
Expand All @@ -88,7 +88,7 @@ func (endpoint *ClientProtobufEndpoint) Send(messageToSend *EndpointMessage) {
}
err = endpoint.transport.Send(tmsg)
if err != nil {
glog.Errorf("[ClientProtobufEndpoint] during send - transport error: ", err)
glog.Errorf("[ClientProtobufEndpoint] during send - transport error: %s", err)
return
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/mediationcontainer/remote_mediation_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ func (actionReqHandler *ActionMessageHandler) HandleMessage(serverRequest proto.
request := serverRequest.GetActionRequest()
probeType := request.ProbeType
if actionReqHandler.probes[*probeType] == nil {
glog.Errorf("Received: Action request for unknown probe type : ", *probeType)
glog.Errorf("Received: Action request for unknown probe type : %s", *probeType)
return
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/mediationcontainer/sdk_client_protocol.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (clientProtocol *SdkClientProtocol) NegotiateVersion(transport ITransport)
negotiationResponse.GetNegotiationResult()

if negotiationResponse.GetNegotiationResult().String() != version.NegotiationAnswer_ACCEPTED.String() {
glog.Errorf("Protocol version negotiation failed",
glog.Errorf("Protocol version negotiation failed %s",
negotiationResponse.GetNegotiationResult().String()+") :"+negotiationResponse.GetDescription())
return false
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/probe/probe_builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestNewProbeBuilderWithRegistrationAndDiscoveryClient(t *testing.T) {

dc := probe.getDiscoveryClient(targetId)
if !reflect.DeepEqual(discoveryClient, dc) {
t.Errorf("\nExpected %+v, \ngot %+v", dc)
t.Errorf("\nExpected %+v, \ngot %+v", discoveryClient, dc)
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/probe/turbo_probe.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (theProbe *TurboProbe) GetTurboDiscoveryClient(accountValues []*proto.Accou
target := theProbe.getDiscoveryClient(address)

if target == nil {
glog.Errorf("[GetTurboDiscoveryClient] Cannot find Target for address: " + address)
glog.Errorf("[GetTurboDiscoveryClient] Cannot find Target for address: %s", address)
//TODO: CreateDiscoveryClient(address, accountValues, )
return nil
}
Expand Down
9 changes: 5 additions & 4 deletions pkg/version/proto_version_const.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package version

// Remote Mediation Clients are expected to send the protobuf message version to ensure compatibility with the server.
// This version string is sent as part of the registration protocol in the Negotiation message. Only if the version is
// accepted by the server then the client probes are allowed to register with the server
// Remote Mediation Clients are expected to send the protobuf message version to ensure
// compatibility with the server.
// This version string is sent as part of the registration protocol in the Negotiation message.
// Client probes are allowed to register with the server only if the server accepts the version.
const (
PROTOBUF_VERSION string = "5.9.0"
PROTOBUF_VERSION string = "6.0.0"
)

0 comments on commit 32eb95b

Please sign in to comment.