bt2: make log functions clear error indicator

[babeltrace.git] / src / bindings / python / bt2 / bt2 / native_bt_log_and_append_error.h

diff --git a/src/bindings/python/bt2/bt2/native_bt_log_and_append_error.h b/src/bindings/python/bt2/bt2/native_bt_log_and_append_error.h
index 15295bbfc4c2ea3b8581a760b008bfa933febeb2..77b4c77aa2d6c5002761b31125609c41903ce562 100644 (file)
--- a/src/bindings/python/bt2/bt2/native_bt_log_and_append_error.h
+++ b/src/bindings/python/bt2/bt2/native_bt_log_and_append_error.h
@@ -176,8 +176,10 @@ void restore_bt_error_and_append_current_exception_chain(
 }
 
 static inline
-void log_exception_and_maybe_append_error(int func_log_level,
-               int active_log_level, bool append_error,
+void log_exception_and_maybe_append_cause(
+               int func_log_level,
+               int active_log_level,
+               bool append_error,
                bt_self_component_class *self_component_class,
                bt_self_component *self_component,
                bt_self_message_iterator *self_message_iterator,
@@ -226,26 +228,17 @@ bt_logging_level get_self_message_iterator_log_level(
 }
 
 static inline
-void loge_exception(const char *module_name, int active_log_level)
+void loge_exception_append_cause_clear(const char *module_name, int active_log_level)
 {
-       log_exception_and_maybe_append_error(BT_LOG_ERROR, active_log_level,
+       log_exception_and_maybe_append_cause(BT_LOG_ERROR, active_log_level,
                true, NULL, NULL, NULL, module_name);
-}
-
-static
-void loge_exception_message_iterator(
-               bt_self_message_iterator *self_message_iterator)
-{
-       bt_logging_level log_level = get_self_message_iterator_log_level(
-               self_message_iterator);
-
-       log_exception_and_maybe_append_error(BT_LOG_ERROR, log_level,
-               true, NULL, NULL, self_message_iterator, NULL);
+       PyErr_Clear();
 }
 
 static inline
-void logw_exception(int active_log_level)
+void logw_exception_clear(int active_log_level)
 {
-       log_exception_and_maybe_append_error(BT_LOG_WARNING, active_log_level,
+       log_exception_and_maybe_append_cause(BT_LOG_WARNING, active_log_level,
                false, NULL, NULL, NULL, NULL);
+       PyErr_Clear();
 }