matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename kRpcFail as kRpcError

Browse Source 
Distinguish RPC Failure and RPC Error - the latter is in case of partial
failures

Also make Ack.status required - missed out in last commit
This commit is contained in:
Srivats P 2019-02-16 20:54:11 +05:30
parent 7ea8c96543
commit fcca47e652
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/protocol.proto
View File

@ -177,9 +177,9 @@ message Void {
message Ack { message Ack {
enum RpcStatus { enum RpcStatus {
kRpcSuccess = 0; kRpcSuccess = 0;
kRpcFail = 1; kRpcError = 1;
} }
optional RpcStatus status = 1; // FIXME: make required required RpcStatus status = 1;
optional string notes = 2; optional string notes = 2;
} }

30
server/myservice.cpp
View File

@ -166,7 +166,7 @@ void MyService::modifyPort(::google::protobuf::RpcController* /*controller*/,
} }
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -295,7 +295,7 @@ void MyService::addStream(::google::protobuf::RpcController* controller,
portLock[portId]->unlock(); portLock[portId]->unlock();
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -346,7 +346,7 @@ void MyService::deleteStream(::google::protobuf::RpcController* controller,
portLock[portId]->unlock(); portLock[portId]->unlock();
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -407,7 +407,7 @@ void MyService::modifyStream(::google::protobuf::RpcController* controller,
if (fail || err) { if (fail || err) {
notes += frameValueErrorNotes(portId, err); notes += frameValueErrorNotes(portId, err);
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -461,7 +461,7 @@ void MyService::startTransmit(::google::protobuf::RpcController* /*controller*/,
} }
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -498,7 +498,7 @@ void MyService::stopTransmit(::google::protobuf::RpcController* /*controller*/,
} }
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -534,7 +534,7 @@ void MyService::startCapture(::google::protobuf::RpcController* /*controller*/,
} }
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -569,7 +569,7 @@ void MyService::stopCapture(::google::protobuf::RpcController* /*controller*/,
} }
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -688,7 +688,7 @@ void MyService::clearStats(::google::protobuf::RpcController* /*controller*/,
} }
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -759,7 +759,7 @@ void MyService::clearStreamStats(
} }
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -942,7 +942,7 @@ void MyService::addDeviceGroup(
portLock[portId]->unlock(); portLock[portId]->unlock();
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -998,7 +998,7 @@ void MyService::deleteDeviceGroup(
portLock[portId]->unlock(); portLock[portId]->unlock();
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -1052,7 +1052,7 @@ void MyService::modifyDeviceGroup(
portLock[portId]->unlock(); portLock[portId]->unlock();
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -1132,7 +1132,7 @@ void MyService::resolveDeviceNeighbors(
} }
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else
@ -1169,7 +1169,7 @@ void MyService::clearDeviceNeighbors(
} }
if (fail) { if (fail) {
response->set_status(OstProto::Ack::kRpcFail); response->set_status(OstProto::Ack::kRpcError);
response->set_notes(notes.toStdString()); response->set_notes(notes.toStdString());
} }
else else