From f552a0ea788225d8fe80942d6e8bd6500f788393 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 11 四月 2022 09:08:20 +0800
Subject: [PATCH] add log
---
src/nng_wrap.cpp | 4 ++
src/interface_bus_api.cpp | 22 +++++++++--
src/nng_wrap.h | 1
src/bn_api.cpp | 36 ++++++++++++++++-
4 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/src/bn_api.cpp b/src/bn_api.cpp
index 2ea2429..d63e96c 100644
--- a/src/bn_api.cpp
+++ b/src/bn_api.cpp
@@ -97,6 +97,10 @@
if (!topics || topics_len <= 0) return false;
const auto& url = get_url(URLRegTopic);
+ if (url.empty()) {
+ set_last_error("BHRegisterTopics url empty");
+ return false;
+ }
bhome_msg::MsgTopicList mtl;
if (!mtl.ParseFromArray(topics, topics_len)){
@@ -130,7 +134,10 @@
if (!topic || topic_len <= 0) return false;
auto url(get_url(URLQueryTopic));
-
+ if (url.empty()) {
+ set_last_error("BHQueryTopicAddress url empty");
+ return false;
+ }
// if (remote && remote_len > 0){
// BHAddress addr;
// if (addr.ParseFromArray(remote, remote_len)){
@@ -156,6 +163,10 @@
// if (!query || query_len <= 0) return false;
auto url(get_url(URLQueryProcs));
+ if (url.empty()) {
+ set_last_error("BHQueryProcs url empty");
+ return false;
+ }
// if (remote && remote_len > 0){
// BHAddress addr;
@@ -193,6 +204,10 @@
newPub.set_data(string{(const char*)msgpub, (const size_t)msgpub_len});
string msg(newPub.SerializeAsString());
+ if (pub.topic().empty()) {
+ set_last_error("BHPublish topic empty");
+ return false;
+ }
auto ret = publish(pub.topic(), msg.data(), msg.size());
if (ret == 0) return false;
return true;
@@ -226,12 +241,23 @@
// 璁㈤槄
int BHSubscribeTopics(const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms)
{
- return sub(get_url(URLSubLocal), topics, topics_len, reply, reply_len, timeout_ms);
+ const auto& url = get_url(URLSubLocal);
+ if (url.empty()) {
+ set_last_error("BHSubscribeTopics url empty");
+ return false;
+ }
+ return sub(url, topics, topics_len, reply, reply_len, timeout_ms);
}
// 璁㈤槄缃戠粶,涓嶅疄鐜�
int BHSubscribeNetTopics(const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms)
{
- return sub(get_url(URLSubNet), topics, topics_len, reply, reply_len, timeout_ms);
+ const auto& url = get_url(URLSubNet);
+ if (url.empty()) {
+ set_last_error("BHSubscribeNetTopics url empty");
+ return false;
+ }
+
+ return sub(url, topics, topics_len, reply, reply_len, timeout_ms);
}
// 璇诲彇璁㈤槄娑堟伅,proc_id鏆傛椂娌＄敤锛岃繑鍥瀎ake msg
@@ -339,6 +365,10 @@
}
}
}
+ if (url.empty()) {
+ set_last_error("BHRequest url empty");
+ return false;
+ }
int rc = request2(url, request, request_len, reply, reply_len, timeout_ms);
if (rc < 0) return false;
diff --git a/src/interface_bus_api.cpp b/src/interface_bus_api.cpp
index 65dd669..638f31a 100644
--- a/src/interface_bus_api.cpp
+++ b/src/interface_bus_api.cpp
@@ -108,8 +108,12 @@
}
string msg(mtl2.SerializeAsString());
-
- return simple_request(get_url(URLRegTopic), msg.data(), msg.size(), reply, reply_len, timeout_ms);
+ const auto& url = get_url(URLRegTopic);
+ if (url.empty()) {
+ set_last_error("bus_register_topics url empty");
+ return false;
+ }
+ return simple_request(url, msg.data(), msg.size(), reply, reply_len, timeout_ms);
}
int bus_query_topic_address(void* handle, const void *remote,
@@ -132,6 +136,10 @@
}
auto url(get_url(URLQueryTopic));
+ if (url.empty()) {
+ set_last_error("bus_query_topic_address url empty");
+ return false;
+ }
// if (remote && remote_len > 0){
// BHAddress addr;
@@ -166,7 +174,10 @@
}
auto url(get_url(URLQueryProcs));
-
+ if (url.empty()) {
+ set_last_error("bus_query_procs url empty");
+ return false;
+ }
// if (remote && remote_len > 0){
// BHAddress addr;
// if (addr.ParseFromArray(remote, remote_len)){
@@ -344,7 +355,10 @@
}
}
}
-
+ if (url.empty()) {
+ set_last_error("bus_request url empty");
+ return false;
+ }
int rc = request2(url, request, request_len, reply, reply_len, timeout_ms);
if (rc < 0) return false;
copy_memory(proc_id, proc_id_len, procid.data(), procid.size());
diff --git a/src/nng_wrap.cpp b/src/nng_wrap.cpp
index 299ce88..785ef1d 100644
--- a/src/nng_wrap.cpp
+++ b/src/nng_wrap.cpp
@@ -69,6 +69,10 @@
*dest_len = src_len;
}
+void set_last_error(const std::string& emsg){
+ verbose_info += emsg;
+}
+
void get_last_error(int* ec, void** emsg, int* emsg_len){
*emsg = NULL;
*emsg_len = 0;
diff --git a/src/nng_wrap.h b/src/nng_wrap.h
index 10b318f..6d82afb 100644
--- a/src/nng_wrap.h
+++ b/src/nng_wrap.h
@@ -7,6 +7,7 @@
void copy_memory(void** dest, int *dest_len, const void* src, const int src_len);
+void set_last_error(const std::string& emsg);
void get_last_error(int* ec, void** emsg, int* emsg_len);
void free_nng(void* data, const int data_len);
--
Gitblit v1.8.0