X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flogging.c;h=f467354313c5bf8e7a43bb01b568ef921b77f43e;hb=510400a9feefbca30a23190dfd80562a834eb347;hp=30ab704abd774b52a4b965c684e4c62c9f592870;hpb=3f3b176151b4163f9ae85bc583865850a18a6ce4;p=babeltrace.git

diff --git a/src/lib/logging.c b/src/lib/logging.c
index 30ab704a..f4673543 100644
--- a/src/lib/logging.c
+++ b/src/lib/logging.c
@@ -24,31 +24,26 @@
 #include <babeltrace2/logging.h>
 #include <babeltrace2/version.h>
 
-#define BT_LOG_TAG "LIB"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/LOGGING"
+#include "lib/logging.h"
 
-#ifdef BT_DEV_MODE
 /*
- * Default log level is FATAL in developer mode because fatal logging is
- * our way to communicate an unsatisfied precondition and the details.
- */
-# define DEFAULT_LOG_LEVEL	BT_LOG_FATAL
-#else
-/*
- * In non-developer mode, use NONE by default: we don't print logging
- * statements for any executable which links with the library. The
- * executable must call bt_logging_set_global_level() or the
- * executable's user must set the BABELTRACE_LOGGING_GLOBAL_LEVEL
- * environment variable to enable logging.
+ * This is exported because even though the Python plugin provider is a
+ * different shared object for packaging purposes, it's still considered
+ * part of the library and therefore needs the library's run-time log
+ * level.
+ *
+ * The default log level is NONE: we don't print logging statements for
+ * any executable which links with the library. The executable must call
+ * bt_logging_set_global_level() or the executable's user must set the
+ * `LIBBABELTRACE2_INIT_LOG_LEVEL` environment variable to enable
+ * logging.
  */
-# define DEFAULT_LOG_LEVEL	BT_LOG_NONE
-#endif /* BT_DEV_MODE */
-
-int bt_lib_log_level = DEFAULT_LOG_LEVEL;
+int bt_lib_log_level = BT_LOG_NONE;
 
 enum bt_logging_level bt_logging_get_minimal_level(void)
 {
-	return BT_LOG_LEVEL;
+	return BT_MINIMAL_LOG_LEVEL;
 }
 
 enum bt_logging_level bt_logging_get_global_level(void)
@@ -58,17 +53,6 @@ enum bt_logging_level bt_logging_get_global_level(void)
 
 void bt_logging_set_global_level(enum bt_logging_level log_level)
 {
-#ifdef BT_DEV_MODE
-	/*
-	 * Do not allow the library's log level to fall to NONE when in
-	 * developer mode because fatal logging is our way to
-	 * communicate an unsatisfied precondition and the details.
-	 */
-	if (log_level == BT_LOG_NONE) {
-		log_level = BT_LOG_FATAL;
-	}
-#endif
-
 	bt_lib_log_level = log_level;
 }
 
@@ -79,7 +63,7 @@ void __attribute__((constructor)) bt_logging_ctor(void)
 		"";
 
 	bt_logging_set_global_level(
-		bt_log_get_level_from_env("BABELTRACE_LOGGING_GLOBAL_LEVEL"));
+		bt_log_get_level_from_env("LIBBABELTRACE2_INIT_LOG_LEVEL"));
 	BT_LOGI("Babeltrace %d.%d.%d%s library loaded: "
 		"major=%d, minor=%d, patch=%d, extra=\"%s\"",
 		bt_version_get_major(), bt_version_get_minor(),