Skip to content

Commit 62a7b2f

Browse files
alexanderosteralexanderoster
committed
Added GRPC Error Handling
1 parent 5589582 commit 62a7b2f

File tree

5 files changed

+57
-31
lines changed

5 files changed

+57
-31
lines changed

‎ACT/LibGRPCWrapper.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,20 @@
6464
<error name="MESSAGISNULL" code="1024" description="Internal error: Message is null" />
6565
<error name="MESSAGREFLECTIONISNULL" code="1025" description="Internal error: Message reflection is null" />
6666
<error name="COULDNOTRETRIEVETEMPPATHS" code="1026" description="Could not retrieve temp paths" />
67-
<error name="COULDNOTCONVERTUNICODESTRING" code="1027" description="Could not convert unicode string" />
68-
67+
<error name="COULDNOTCONVERTUNICODESTRING" code="1027" description="Could not convert unicode string" />
6968
<error name="MESSAGEFIELDNOTFOUND" code="1028" description="Message field not found" />
69+
<error name="COULDNOTSTARTRPCCALL" code="1029" description="Could not start RPC Call" />
70+
<error name="COULDNOTSENDREQUEST" code="1030" description="Could not send request" />
71+
<error name="COULDNOTINDICATEENDOFREQUEST" code="1031" description="Could not indicate end of request" />
72+
<error name="COULDNOTRECEIVERESPONSE" code="1032" description="Could not receive response" />
73+
<error name="COULDNOTFINISHRPCCALL" code="1033" description="Could not finish RPC Call" />
74+
<error name="RPCFAILED" code="1034" description="RPC failed" />
75+
76+
77+
78+
79+
80+
7081

7182

7283
</errors>

‎Headers/CppDynamic/libgrpcwrapper_dynamic.hpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,12 @@ class ELibGRPCWrapperException : public std::exception {
205205
case LIBGRPCWRAPPER_ERROR_COULDNOTRETRIEVETEMPPATHS: return "COULDNOTRETRIEVETEMPPATHS";
206206
case LIBGRPCWRAPPER_ERROR_COULDNOTCONVERTUNICODESTRING: return "COULDNOTCONVERTUNICODESTRING";
207207
case LIBGRPCWRAPPER_ERROR_MESSAGEFIELDNOTFOUND: return "MESSAGEFIELDNOTFOUND";
208+
case LIBGRPCWRAPPER_ERROR_COULDNOTSTARTRPCCALL: return "COULDNOTSTARTRPCCALL";
209+
case LIBGRPCWRAPPER_ERROR_COULDNOTSENDREQUEST: return "COULDNOTSENDREQUEST";
210+
case LIBGRPCWRAPPER_ERROR_COULDNOTINDICATEENDOFREQUEST: return "COULDNOTINDICATEENDOFREQUEST";
211+
case LIBGRPCWRAPPER_ERROR_COULDNOTRECEIVERESPONSE: return "COULDNOTRECEIVERESPONSE";
212+
case LIBGRPCWRAPPER_ERROR_COULDNOTFINISHRPCCALL: return "COULDNOTFINISHRPCCALL";
213+
case LIBGRPCWRAPPER_ERROR_RPCFAILED: return "RPCFAILED";
208214
}
209215
return "UNKNOWN";
210216
}
@@ -241,6 +247,12 @@ class ELibGRPCWrapperException : public std::exception {
241247
case LIBGRPCWRAPPER_ERROR_COULDNOTRETRIEVETEMPPATHS: return "Could not retrieve temp paths";
242248
case LIBGRPCWRAPPER_ERROR_COULDNOTCONVERTUNICODESTRING: return "Could not convert unicode string";
243249
case LIBGRPCWRAPPER_ERROR_MESSAGEFIELDNOTFOUND: return "Message field not found";
250+
case LIBGRPCWRAPPER_ERROR_COULDNOTSTARTRPCCALL: return "Could not start RPC Call";
251+
case LIBGRPCWRAPPER_ERROR_COULDNOTSENDREQUEST: return "Could not send request";
252+
case LIBGRPCWRAPPER_ERROR_COULDNOTINDICATEENDOFREQUEST: return "Could not indicate end of request";
253+
case LIBGRPCWRAPPER_ERROR_COULDNOTRECEIVERESPONSE: return "Could not receive response";
254+
case LIBGRPCWRAPPER_ERROR_COULDNOTFINISHRPCCALL: return "Could not finish RPC Call";
255+
case LIBGRPCWRAPPER_ERROR_RPCFAILED: return "RPC failed";
244256
}
245257
return "unknown error";
246258
}

‎Headers/CppDynamic/libgrpcwrapper_types.hpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ typedef void * LibGRPCWrapper_pvoid;
124124
#define LIBGRPCWRAPPER_ERROR_COULDNOTRETRIEVETEMPPATHS 1026 /** Could not retrieve temp paths */
125125
#define LIBGRPCWRAPPER_ERROR_COULDNOTCONVERTUNICODESTRING 1027 /** Could not convert unicode string */
126126
#define LIBGRPCWRAPPER_ERROR_MESSAGEFIELDNOTFOUND 1028 /** Message field not found */
127+
#define LIBGRPCWRAPPER_ERROR_COULDNOTSTARTRPCCALL 1029 /** Could not start RPC Call */
128+
#define LIBGRPCWRAPPER_ERROR_COULDNOTSENDREQUEST 1030 /** Could not send request */
129+
#define LIBGRPCWRAPPER_ERROR_COULDNOTINDICATEENDOFREQUEST 1031 /** Could not indicate end of request */
130+
#define LIBGRPCWRAPPER_ERROR_COULDNOTRECEIVERESPONSE 1032 /** Could not receive response */
131+
#define LIBGRPCWRAPPER_ERROR_COULDNOTFINISHRPCCALL 1033 /** Could not finish RPC Call */
132+
#define LIBGRPCWRAPPER_ERROR_RPCFAILED 1034 /** RPC failed */
127133

128134
/*************************************************************************************************************************
129135
Error strings for LibGRPCWrapper
@@ -160,6 +166,12 @@ inline const char * LIBGRPCWRAPPER_GETERRORSTRING (LibGRPCWrapperResult nErrorCo
160166
case LIBGRPCWRAPPER_ERROR_COULDNOTRETRIEVETEMPPATHS: return "Could not retrieve temp paths";
161167
case LIBGRPCWRAPPER_ERROR_COULDNOTCONVERTUNICODESTRING: return "Could not convert unicode string";
162168
case LIBGRPCWRAPPER_ERROR_MESSAGEFIELDNOTFOUND: return "Message field not found";
169+
case LIBGRPCWRAPPER_ERROR_COULDNOTSTARTRPCCALL: return "Could not start RPC Call";
170+
case LIBGRPCWRAPPER_ERROR_COULDNOTSENDREQUEST: return "Could not send request";
171+
case LIBGRPCWRAPPER_ERROR_COULDNOTINDICATEENDOFREQUEST: return "Could not indicate end of request";
172+
case LIBGRPCWRAPPER_ERROR_COULDNOTRECEIVERESPONSE: return "Could not receive response";
173+
case LIBGRPCWRAPPER_ERROR_COULDNOTFINISHRPCCALL: return "Could not finish RPC Call";
174+
case LIBGRPCWRAPPER_ERROR_RPCFAILED: return "RPC failed";
163175
default: return "unknown error";
164176
}
165177
}

‎Implementation/libgrpcwrapper_connectinstance.cpp

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -179,72 +179,51 @@ grpc::ByteBuffer CConnectionInstance::sendMessageBlocking(google::protobuf::Mess
179179
void* tag = nullptr;
180180
bool ok = false;
181181

182-
std::cout << "Initialize RPC call and wait for confirmation";
183-
184182
//Initialize RPC calland wait for confirmation
185183
call->StartCall((void*)1);
186184

187185
if (!completionQueue.Next(&tag, &ok) || !ok || tag != (void*)1)
188186
{
189-
std::cout << "Could not start RPC call" << std::endl;
190-
}
191-
else
192-
{
193-
std::cout << "Successfully started RPC call" << std::endl;
187+
throw ELibGRPCWrapperInterfaceException(LIBGRPCWRAPPER_ERROR_COULDNOTSTARTRPCCALL, "Could not start RPC call: " + sServiceMethod);
194188
}
195189

196190
// Send request to server and wait for confirmation
197191
call->Write(requestBuffer, (void*)2);
198192

199193
if (!completionQueue.Next(&tag, &ok) || !ok || tag != (void*)2)
200194
{
201-
std::cout << "Could not send request" << std::endl;
202-
}
203-
else
204-
{
205-
std::cout << "Successfully sent request" << std::endl;
195+
throw ELibGRPCWrapperInterfaceException(LIBGRPCWRAPPER_ERROR_COULDNOTSENDREQUEST, "Could not send request: " + sServiceMethod);
206196
}
207197

208198
// Indicate that request is completed and wait for confirmation
209199
call->WritesDone((void*)3);
210200

211201
if (!completionQueue.Next(&tag, &ok) || !ok || tag != (void*)3)
212202
{
213-
std::cout << "Could not indicate end of request" << std::endl;
214-
}
215-
else
216-
{
217-
std::cout << "Successfully indicated end of request" << std::endl;
203+
throw ELibGRPCWrapperInterfaceException(LIBGRPCWRAPPER_ERROR_COULDNOTINDICATEENDOFREQUEST, "Could not indicate end of request: " + sServiceMethod);
218204
}
219-
205+
220206
// Read response from server and wait for confirmation
221207
grpc::ByteBuffer responseBuffer;
222208
call->Read(&responseBuffer, (void*)4);
223209

224210
if (!completionQueue.Next(&tag, &ok) || !ok || tag != (void*)4)
225211
{
226-
std::cout << "Could not receive response" << std::endl;
227-
}
228-
else
229-
{
230-
std::cout << "Successfully received response" << std::endl;
212+
throw ELibGRPCWrapperInterfaceException(LIBGRPCWRAPPER_ERROR_COULDNOTRECEIVERESPONSE, "Could not receive response: " + sServiceMethod);
231213
}
232214

233215
// Finish RPC call and wait for confirmation
234216
call->Finish(&status, (void*)5);
235217

236218
if (!completionQueue.Next(&tag, &ok) || !ok || tag != (void*)5)
237219
{
238-
std::cout << "Could not finish RPC call" << std::endl;
239-
}
240-
else
241-
{
242-
std::cout << "Successfully finished RPC call" << std::endl;
220+
throw ELibGRPCWrapperInterfaceException(LIBGRPCWRAPPER_ERROR_COULDNOTFINISHRPCCALL, "Could not finish RPC call: " + sServiceMethod);
243221
}
244222

245223
if (!status.ok())
246224
{
247-
std::cerr << "RPC failed: " << status.error_message() << " - code: " << status.error_code() << std::endl;
225+
std::string sErrorMessage = "RPC failed: " + sServiceMethod + " (" + status.error_message() + " - code: " + std::to_string(status.error_code()) + ")";
226+
throw ELibGRPCWrapperInterfaceException(LIBGRPCWRAPPER_ERROR_RPCFAILED, sErrorMessage);
248227
}
249228

250229
return responseBuffer;

‎Interfaces/libgrpcwrapper_types.hpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ typedef void * LibGRPCWrapper_pvoid;
124124
#define LIBGRPCWRAPPER_ERROR_COULDNOTRETRIEVETEMPPATHS 1026 /** Could not retrieve temp paths */
125125
#define LIBGRPCWRAPPER_ERROR_COULDNOTCONVERTUNICODESTRING 1027 /** Could not convert unicode string */
126126
#define LIBGRPCWRAPPER_ERROR_MESSAGEFIELDNOTFOUND 1028 /** Message field not found */
127+
#define LIBGRPCWRAPPER_ERROR_COULDNOTSTARTRPCCALL 1029 /** Could not start RPC Call */
128+
#define LIBGRPCWRAPPER_ERROR_COULDNOTSENDREQUEST 1030 /** Could not send request */
129+
#define LIBGRPCWRAPPER_ERROR_COULDNOTINDICATEENDOFREQUEST 1031 /** Could not indicate end of request */
130+
#define LIBGRPCWRAPPER_ERROR_COULDNOTRECEIVERESPONSE 1032 /** Could not receive response */
131+
#define LIBGRPCWRAPPER_ERROR_COULDNOTFINISHRPCCALL 1033 /** Could not finish RPC Call */
132+
#define LIBGRPCWRAPPER_ERROR_RPCFAILED 1034 /** RPC failed */
127133

128134
/*************************************************************************************************************************
129135
Error strings for LibGRPCWrapper
@@ -160,6 +166,12 @@ inline const char * LIBGRPCWRAPPER_GETERRORSTRING (LibGRPCWrapperResult nErrorCo
160166
case LIBGRPCWRAPPER_ERROR_COULDNOTRETRIEVETEMPPATHS: return "Could not retrieve temp paths";
161167
case LIBGRPCWRAPPER_ERROR_COULDNOTCONVERTUNICODESTRING: return "Could not convert unicode string";
162168
case LIBGRPCWRAPPER_ERROR_MESSAGEFIELDNOTFOUND: return "Message field not found";
169+
case LIBGRPCWRAPPER_ERROR_COULDNOTSTARTRPCCALL: return "Could not start RPC Call";
170+
case LIBGRPCWRAPPER_ERROR_COULDNOTSENDREQUEST: return "Could not send request";
171+
case LIBGRPCWRAPPER_ERROR_COULDNOTINDICATEENDOFREQUEST: return "Could not indicate end of request";
172+
case LIBGRPCWRAPPER_ERROR_COULDNOTRECEIVERESPONSE: return "Could not receive response";
173+
case LIBGRPCWRAPPER_ERROR_COULDNOTFINISHRPCCALL: return "Could not finish RPC Call";
174+
case LIBGRPCWRAPPER_ERROR_RPCFAILED: return "RPC failed";
163175
default: return "unknown error";
164176
}
165177
}

0 commit comments

Comments
 (0)