Support logging error messages

chungphb · chungphb · commit 0462ffd288ea · 2021-06-29T04:30:50.000-04:00
diff --git a/include/chirpstack_client/chirpstack_client.h b/include/chirpstack_client/chirpstack_client.h
@@ -26,6 +26,7 @@ namespace chirpstack_cpp_client {
 
 struct chirpstack_client_config {
     std::string jwt_token;
+    bool log_enabled = false;
 };
 
 struct chirpstack_client {
@@ -143,6 +144,9 @@ struct chirpstack_client {
     update_user_password_response update_user_password(const update_user_password_request& request);
 
     void set_jwt_token(const std::string& jwt_token);
+    void enable_log();
+    void disable_log();
+    void log(const std::string& error_message);
 
 private:
     chirpstack_client_config _config;
diff --git a/src/chirpstack_client.cc b/src/chirpstack_client.cc
diff --git a/tests/application_test.cc b/tests/application_test.cc
@@ -140,6 +140,7 @@ int main(int argc, char** argv) {
 
     chirpstack_client_config config{};
     config.jwt_token = test_config().jwt_token;
+    config.log_enabled = test_config().client_log_enabled;
     chirpstack_client client{test_config().application_server, config};
     test_cache cache;
 
diff --git a/tests/device_profile_test.cc b/tests/device_profile_test.cc
@@ -141,6 +141,7 @@ int main(int argc, char** argv) {
 
     chirpstack_client_config config{};
     config.jwt_token = test_config().jwt_token;
+    config.log_enabled = test_config().client_log_enabled;
     chirpstack_client client{test_config().application_server, config};
     test_cache cache;
 
diff --git a/tests/device_test.cc b/tests/device_test.cc
@@ -419,6 +419,7 @@ int main(int argc, char** argv) {
 
     chirpstack_client_config config{};
     config.jwt_token = test_config().jwt_token;
+    config.log_enabled = test_config().client_log_enabled;
     chirpstack_client client{test_config().application_server, config};
     test_cache cache;
 
diff --git a/tests/gateway_profile_test.cc b/tests/gateway_profile_test.cc
@@ -186,6 +186,7 @@ int main(int argc, char** argv) {
 
     chirpstack_client_config config{};
     config.jwt_token = test_config().global_jwt_token;
+    config.log_enabled = test_config().client_log_enabled;
     chirpstack_client client{test_config().application_server, config};
     test_cache cache;
 
diff --git a/tests/gateway_test.cc b/tests/gateway_test.cc
@@ -234,6 +234,7 @@ int main(int argc, char** argv) {
 
     chirpstack_client_config config{};
     config.jwt_token = test_config().jwt_token;
+    config.log_enabled = test_config().client_log_enabled;
     chirpstack_client client{test_config().application_server, config};
     test_cache cache;
 
diff --git a/tests/internal_test.cc b/tests/internal_test.cc
@@ -296,6 +296,7 @@ int main(int argc, char** argv) {
 
     chirpstack_client_config config{};
     chirpstack_client client{test_config().application_server, config};
+    config.log_enabled = test_config().client_log_enabled;
     test_cache cache;
 
     std::cout << "TEST LOGIN" << std::endl;
diff --git a/tests/multicast_group_test.cc b/tests/multicast_group_test.cc
@@ -392,6 +392,7 @@ int main(int argc, char** argv) {
 
     chirpstack_client_config config{};
     config.jwt_token = test_config().jwt_token;
+    config.log_enabled = test_config().client_log_enabled;
     chirpstack_client client{test_config().application_server, config};
     test_cache cache;
 
diff --git a/tests/network_server_test.cc b/tests/network_server_test.cc
@@ -186,6 +186,7 @@ int main(int argc, char** argv) {
 
     chirpstack_client_config config{};
     config.jwt_token = test_config().global_jwt_token;
+    config.log_enabled = test_config().client_log_enabled;
     chirpstack_client client{test_config().application_server, config};
     test_cache cache;
 
diff --git a/tests/organization_test.cc b/tests/organization_test.cc
@@ -260,6 +260,7 @@ int main(int argc, char** argv) {
 
     chirpstack_client_config config{};
     config.jwt_token = test_config().global_jwt_token;
+    config.log_enabled = test_config().client_log_enabled;
     chirpstack_client client{test_config().application_server, config};
     test_cache cache;
 
diff --git a/tests/service_profile_test.cc b/tests/service_profile_test.cc
@@ -241,6 +241,7 @@ int main(int argc, char** argv) {
 
     chirpstack_client_config config{};
     config.jwt_token = test_config().global_jwt_token;
+    config.log_enabled = test_config().client_log_enabled;
     chirpstack_client client{test_config().application_server, config};
     test_cache cache;
 
diff --git a/tests/test_config.cc b/tests/test_config.cc
@@ -16,7 +16,12 @@ void test_config::parse() {
 
     // General config
 
-    const toml::Value* val = config.find("general.application_server");
+    const toml::Value* val = config.find("general.client_log_enabled");
+    if (val && val->is<bool>()) {
+        client_log_enabled = val->as<bool>();
+    }
+
+    val = config.find("general.application_server");
     if (val && val->is<std::string>()) {
         application_server = val->as<std::string>();
     } else {
diff --git a/tests/test_config.h b/tests/test_config.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 struct test_config {
+    bool client_log_enabled = false;
     std::string application_server = "localhost::8080";
     std::string jwt_token;
     std::string service_profile_id;
diff --git a/tests/test_config.toml b/tests/test_config.toml
@@ -1,5 +1,5 @@
 [general]
-log_level = 4
+client_log_enabled = false
 application_server = "localhost:8080"
 
 [test]
diff --git a/tests/user_test.cc b/tests/user_test.cc
@@ -138,6 +138,7 @@ int main(int argc, char** argv) {
 
     chirpstack_client_config config{};
     config.jwt_token = test_config().global_jwt_token;
+    config.log_enabled = test_config().client_log_enabled;
     chirpstack_client client{test_config().application_server, config};
     test_cache cache;
 
