Unverified Commit 9da52d56 authored by kladko's avatar kladko

bug/SKALE-3662 Adding libzmq

parent 351f5bca
...@@ -50,3 +50,5 @@ ...@@ -50,3 +50,5 @@
/*.user /*.user
/cert/*.csr /cert/*.csr
/cert/*.crt /cert/*.crt
/jsonrpc/
/sgx-gmp/
...@@ -95,22 +95,24 @@ string(__FUNCTION__) + ": server error. Please see server log."; ...@@ -95,22 +95,24 @@ string(__FUNCTION__) + ": server error. Please see server log.";
#define HANDLE_SGX_EXCEPTION(__RESULT__) \ #define HANDLE_SGX_EXCEPTION(__RESULT__) \
catch (const SGXException& _e) { \ catch (const SGXException& _e) { \
if (_e.getStatus() != 0) {__RESULT__["status"] = _e.getStatus();} else { __RESULT__["status"] = -1 * (10000 + __LINE__);}; \ if (_e.getStatus() != 0) {__RESULT__["status"] = _e.getStatus();} else { __RESULT__["status"] = -1 * (10000 + __LINE__);}; \
__RESULT__["errorMessage"] = _e.getErrString(); \ auto errStr = __FUNCTION__ + string(" failed:") + _e.getErrString(); \
if (_e.getErrString().size() == 0) {__RESULT__["errorMessage"] = string(__FUNCTION__);}; \ __RESULT__["errorMessage"] = errStr; \
spdlog::error("JSON call failed {}", __FUNCTION__); \ spdlog::error(errStr); \
return __RESULT__; \ return __RESULT__; \
} catch (const exception& _e) { \ } catch (const exception& _e) { \
__RESULT__["status"] = -1 * (10000 + __LINE__); \ __RESULT__["status"] = -1 * (10000 + __LINE__); \
exception_ptr p = current_exception(); \ exception_ptr p = current_exception(); \
__RESULT__["errorMessage"] = string(p.__cxa_exception_type()->name()) + ":" + _e.what(); \ auto errStr = __FUNCTION__ + string(" failed:") + p.__cxa_exception_type()->name() + ":" + _e.what(); \
spdlog::error("JSON call failed {}", __FUNCTION__); \ __RESULT__["errorMessage"] = errStr; \
spdlog::error(errStr); \
return __RESULT__; \ return __RESULT__; \
}\ } \
catch (...) { \ catch (...) { \
exception_ptr p = current_exception(); \ exception_ptr p = current_exception(); \
spdlog::error(string("Exception:") + p.__cxa_exception_type()->name()); \ auto errStr = __FUNCTION__ + string(" failed:") + p.__cxa_exception_type()->name(); \
__RESULT__["errorMessage"] = string(p.__cxa_exception_type()->name()); \ spdlog::error(errStr); \
spdlog::error("JSON call failed {}", __FUNCTION__); \ __RESULT__["errorMessage"] = errStr ; \
spdlog::error(errStr); \
return __RESULT__; \ return __RESULT__; \
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment