diff --git a/net/server/enc_server/dap_enc_ks.c b/net/server/enc_server/dap_enc_ks.c index 52ba1800c3e7289140d17b668961b7f59a14433f..e5670037d9caf8107e660a323996c39cf4e0e476 100644 --- a/net/server/enc_server/dap_enc_ks.c +++ b/net/server/enc_server/dap_enc_ks.c @@ -73,7 +73,6 @@ void s_save_key_in_storge(dap_enc_ks_key_t *a_key) //dap_memcache_put(a_key->id, l_serialize_key, sizeof (dap_enc_key_serialize_t), s_memcache_expiration_key); free(l_serialize_key); } - log_it(L_MSG, "New ks key added %s", a_key->id); } @@ -161,7 +160,6 @@ dap_enc_ks_key_t * dap_enc_ks_add(struct dap_enc_key * key) void dap_enc_ks_delete(const char *id) { - log_it(L_MSG, "New ks key deleted %s", id); dap_enc_ks_key_t *delItem = dap_enc_ks_find(id); if (delItem) { HASH_DEL (_ks, delItem); diff --git a/net/server/json_rpc/rpc_core/src/dap_json_rpc_request.c b/net/server/json_rpc/rpc_core/src/dap_json_rpc_request.c index 65244279e7e8aca277e12f14e110623b63a3797d..0d71cc3e225da1018dde58c5e46a8752c5ece599 100644 --- a/net/server/json_rpc/rpc_core/src/dap_json_rpc_request.c +++ b/net/server/json_rpc/rpc_core/src/dap_json_rpc_request.c @@ -150,6 +150,9 @@ static int s_exec_cmd_request_get_response(struct exec_cmd_request *a_exec_cmd_r l_response_dec, l_response_dec_size_max, DAP_ENC_DATA_TYPE_RAW); *a_response_out = json_tokener_parse(l_response_dec); + if (!*a_response_out && l_response_dec) { + *a_response_out = json_object_new_string(l_response_dec); + } *a_response_out_size = l_response_dec_size; } else { log_it(L_ERROR, "Empty response in json-rpc"); @@ -543,7 +546,7 @@ int dap_json_rpc_request_send(dap_client_pvt_t* a_client_internal, dap_json_rpc s_exec_cmd_response_handler, s_exec_cmd_error_handler, l_exec_cmd_request, l_custom_header); - int l_ret = dap_chain_exec_cmd_list_wait(l_exec_cmd_request, 10000); + int l_ret = dap_chain_exec_cmd_list_wait(l_exec_cmd_request, 100000); switch (l_ret) { case EXEC_CMD_OK :{ if (s_exec_cmd_request_get_response(l_exec_cmd_request, a_response, &l_response_size)) {