discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=7334c657483caf1f9def7e31f61f1e7bf691a06e

commit 7334c657483caf1f9def7e31f61f1e7bf691a06e
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Jan 8 11:42:02 2016 -0500

    disable custom logging when eina backtrace is active
    
    ref 2df04042269f3b5604c719844eac372fa5fcddd2
---
 src/bin/e_log.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_log.c b/src/bin/e_log.c
index 6e694db..798d859 100644
--- a/src/bin/e_log.c
+++ b/src/bin/e_log.c
@@ -27,8 +27,18 @@ _e_log_cb(const Eina_Log_Domain *d, Eina_Log_Level level, 
const char *file, cons
 EINTERN int
 e_log_init(void)
 {
+   const char *bt_level;
+
    e_log_dom = eina_log_domain_register("e", EINA_COLOR_WHITE);
-   eina_log_print_cb_set(_e_log_cb, NULL);
+   bt_level = getenv("EINA_LOG_BACKTRACE");
+   if (bt_level)
+     {
+        int level;
+
+        level = strtol(bt_level, NULL, 10);
+        if (level < 1)
+          eina_log_print_cb_set(_e_log_cb, NULL);
+     }
    return e_log_dom != -1;
 }
 

-- 


Reply via email to