lib: remove LOADING_ERROR status

[babeltrace.git] / src / python-plugin-provider / python-plugin-provider.c

diff --git a/src/python-plugin-provider/python-plugin-provider.c b/src/python-plugin-provider/python-plugin-provider.c
index 145d2200527f4f11ad689633e29b7842a36d6adc..43a4cf04250a5c2139b27696665b0604c5585204 100644 (file)
--- a/src/python-plugin-provider/python-plugin-provider.c
+++ b/src/python-plugin-provider/python-plugin-provider.c
@@ -72,7 +72,7 @@ void append_python_traceback_error_cause(void)
        GString *exc = NULL;
 
        if (Py_IsInitialized() && PyErr_Occurred()) {
-               exc = bt_py_common_format_exception(BT_LOG_OUTPUT_LEVEL);
+               exc = bt_py_common_format_current_exception(BT_LOG_OUTPUT_LEVEL);
                if (!exc) {
                        BT_LOGE_STR("Failed to format Python exception.");
                        goto end;
@@ -94,7 +94,7 @@ void log_python_traceback(int log_level)
        GString *exc = NULL;
 
        if (Py_IsInitialized() && PyErr_Occurred()) {
-               exc = bt_py_common_format_exception(BT_LOG_OUTPUT_LEVEL);
+               exc = bt_py_common_format_current_exception(BT_LOG_OUTPUT_LEVEL);
                if (!exc) {
                        BT_LOGE_STR("Failed to format Python exception.");
                        goto end;
@@ -250,9 +250,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                        BT_LIB_LOGW_APPEND_CAUSE(
                                "Cannot find `name` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
-                       status = BT_FUNC_STATUS_LOADING_ERROR;
+                       status = BT_FUNC_STATUS_ERROR;
                } else {
-                       BT_LIB_LOGI(
+                       BT_LIB_LOGW(
                                "Cannot find `name` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
                        status = BT_FUNC_STATUS_NOT_FOUND;
@@ -268,9 +268,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                        BT_LIB_LOGW_APPEND_CAUSE(
                                "Cannot find `author` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
-                       status = BT_FUNC_STATUS_LOADING_ERROR;
+                       status = BT_FUNC_STATUS_ERROR;
                } else {
-                       BT_LIB_LOGI(
+                       BT_LIB_LOGW(
                                "Cannot find `author` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
                        status = BT_FUNC_STATUS_NOT_FOUND;
@@ -286,9 +286,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                        BT_LIB_LOGW_APPEND_CAUSE(
                                "Cannot find `description` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
-                       status = BT_FUNC_STATUS_LOADING_ERROR;
+                       status = BT_FUNC_STATUS_ERROR;
                } else {
-                       BT_LIB_LOGI(
+                       BT_LIB_LOGW(
                                "Cannot find `description` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
                        status = BT_FUNC_STATUS_NOT_FOUND;
@@ -304,9 +304,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                        BT_LIB_LOGW_APPEND_CAUSE(
                                "Cannot find `license` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
-                       status = BT_FUNC_STATUS_LOADING_ERROR;
+                       status = BT_FUNC_STATUS_ERROR;
                } else {
-                       BT_LIB_LOGI(
+                       BT_LIB_LOGW(
                                "Cannot find `license` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
                        status = BT_FUNC_STATUS_NOT_FOUND;
@@ -322,9 +322,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                        BT_LIB_LOGW_APPEND_CAUSE(
                                "Cannot find `version` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
-                       status = BT_FUNC_STATUS_LOADING_ERROR;
+                       status = BT_FUNC_STATUS_ERROR;
                } else {
-                       BT_LIB_LOGI(
+                       BT_LIB_LOGW(
                                "Cannot find `version` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
                        status = BT_FUNC_STATUS_NOT_FOUND;
@@ -341,9 +341,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                        BT_LIB_LOGW_APPEND_CAUSE(
                                "Cannot find `comp_class_addrs` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
-                       status = BT_FUNC_STATUS_LOADING_ERROR;
+                       status = BT_FUNC_STATUS_ERROR;
                } else {
-                       BT_LIB_LOGI(
+                       BT_LIB_LOGW(
                                "Cannot find `comp_class_addrs` attribute in Python plugin info object: "
                                "py-plugin-info-addr=%p", plugin_info);
                        status = BT_FUNC_STATUS_NOT_FOUND;
@@ -360,9 +360,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                                BT_LIB_LOGW_APPEND_CAUSE(
                                        "Cannot decode Python plugin name string: "
                                        "py-plugin-info-addr=%p", plugin_info);
-                               status = BT_FUNC_STATUS_LOADING_ERROR;
+                               status = BT_FUNC_STATUS_ERROR;
                        } else {
-                               BT_LIB_LOGI(
+                               BT_LIB_LOGW(
                                        "Cannot decode Python plugin name string: "
                                        "py-plugin-info-addr=%p", plugin_info);
                                status = BT_FUNC_STATUS_NOT_FOUND;
@@ -377,9 +377,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                        BT_LIB_LOGW_APPEND_CAUSE(
                                "Plugin name is not a string: "
                                "py-plugin-info-addr=%p", plugin_info);
-                       status = BT_FUNC_STATUS_LOADING_ERROR;
+                       status = BT_FUNC_STATUS_ERROR;
                } else {
-                       BT_LIB_LOGI(
+                       BT_LIB_LOGW(
                                "Plugin name is not a string: "
                                "py-plugin-info-addr=%p", plugin_info);
                        status = BT_FUNC_STATUS_NOT_FOUND;
@@ -396,9 +396,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                                BT_LIB_LOGW_APPEND_CAUSE(
                                        "Cannot decode Python plugin author string: "
                                        "py-plugin-info-addr=%p", plugin_info);
-                               status = BT_FUNC_STATUS_LOADING_ERROR;
+                               status = BT_FUNC_STATUS_ERROR;
                        } else {
-                               BT_LIB_LOGI(
+                               BT_LIB_LOGW(
                                        "Cannot decode Python plugin author string: "
                                        "py-plugin-info-addr=%p", plugin_info);
                                status = BT_FUNC_STATUS_NOT_FOUND;
@@ -416,9 +416,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                                BT_LIB_LOGW_APPEND_CAUSE(
                                        "Cannot decode Python plugin description string: "
                                        "py-plugin-info-addr=%p", plugin_info);
-                               status = BT_FUNC_STATUS_LOADING_ERROR;
+                               status = BT_FUNC_STATUS_ERROR;
                        } else {
-                               BT_LIB_LOGI(
+                               BT_LIB_LOGW(
                                        "Cannot decode Python plugin description string: "
                                        "py-plugin-info-addr=%p", plugin_info);
                                status = BT_FUNC_STATUS_NOT_FOUND;
@@ -436,9 +436,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                                BT_LIB_LOGW_APPEND_CAUSE(
                                        "Cannot decode Python plugin license string: "
                                        "py-plugin-info-addr=%p", plugin_info);
-                               status = BT_FUNC_STATUS_LOADING_ERROR;
+                               status = BT_FUNC_STATUS_ERROR;
                        } else {
-                               BT_LIB_LOGI(
+                               BT_LIB_LOGW(
                                        "Cannot decode Python plugin license string: "
                                        "py-plugin-info-addr=%p", plugin_info);
                                status = BT_FUNC_STATUS_NOT_FOUND;
@@ -477,9 +477,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                                        BT_LIB_LOGW_APPEND_CAUSE(
                                                "Invalid Python plugin version format: "
                                                "py-plugin-info-addr=%p", plugin_info);
-                                       status = BT_FUNC_STATUS_LOADING_ERROR;
+                                       status = BT_FUNC_STATUS_ERROR;
                                } else {
-                                       BT_LIB_LOGI(
+                                       BT_LIB_LOGW(
                                                "Invalid Python plugin version format: "
                                                "py-plugin-info-addr=%p", plugin_info);
                                        status = BT_FUNC_STATUS_NOT_FOUND;
@@ -502,9 +502,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                                                BT_LIB_LOGW_APPEND_CAUSE(
                                                        "Cannot decode Python plugin version's extra string: "
                                                        "py-plugin-info-addr=%p", plugin_info);
-                                               status = BT_FUNC_STATUS_LOADING_ERROR;
+                                               status = BT_FUNC_STATUS_ERROR;
                                        } else {
-                                               BT_LIB_LOGI(
+                                               BT_LIB_LOGW(
                                                        "Cannot decode Python plugin version's extra string: "
                                                        "py-plugin-info-addr=%p", plugin_info);
                                                status = BT_FUNC_STATUS_NOT_FOUND;
@@ -558,9 +558,9 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
                                                "Component class address is not an integer in Python plugin info object: "
                                                "py-plugin-info-addr=%p, index=%zu",
                                                plugin_info, i);
-                                       status = BT_FUNC_STATUS_LOADING_ERROR;
+                                       status = BT_FUNC_STATUS_ERROR;
                                } else {
-                                       BT_LIB_LOGI(
+                                       BT_LIB_LOGW(
                                                "Component class address is not an integer in Python plugin info object: "
                                                "py-plugin-info-addr=%p, index=%zu",
                                                plugin_info, i);
@@ -700,9 +700,9 @@ int bt_plugin_python_create_all_from_file(const char *path,
                        append_python_traceback_error_cause();
                        BT_LIB_LOGW_APPEND_CAUSE(
                                "Cannot load Python plugin: path=\"%s\"", path);
-                       status = BT_FUNC_STATUS_LOADING_ERROR;
+                       status = BT_FUNC_STATUS_ERROR;
                } else {
-                       BT_LIB_LOGI(
+                       BT_LIB_LOGW(
                                "Cannot load Python plugin: path=\"%s\"", path);
                        status = BT_FUNC_STATUS_NOT_FOUND;
                }
@@ -750,7 +750,7 @@ int bt_plugin_python_create_all_from_file(const char *path,
 
 error:
        BT_ASSERT(status != BT_FUNC_STATUS_OK);
-       log_python_traceback(fail_on_load_error ? BT_LOG_WARNING : BT_LOG_INFO);
+       log_python_traceback(BT_LOG_WARNING);
        pyerr_clear();
        BT_OBJECT_PUT_REF_AND_RESET(*plugin_set_out);
 
@@ -758,9 +758,7 @@ end:
        bt_plugin_put_ref(plugin);
        Py_XDECREF(py_plugin_info);
 
-       if (basename) {
-               g_free(basename);
-       }
+       g_free(basename);
 
        return status;
 }