Merge branch 'tizen' into sandbox/cyeon/devel

[platform/core/uifw/libtdm.git] / src / tdm_config.c

diff --git a/src/tdm_config.c b/src/tdm_config.c
index fb361d2..95f5119 100644 (file)
--- a/src/tdm_config.c
+++ b/src/tdm_config.c
@@ -9,7 +9,7 @@
  *          Taeheon Kim <th908.kim@samsung.com>,
  *          YoungJun Cho <yj44.cho@samsung.com>,
  *          SooChan Lim <sc1.lim@samsung.com>,
- *          Boram Park <sc1.lim@samsung.com>
+ *          Boram Park <boram1288.park@samsung.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -104,10 +104,24 @@ _tdm_config_check_logs(void)
 
        pthread_mutex_unlock(&g_dic_lock);
 
-       level = tdm_config_get_int(TDM_CONFIG_KEY_DEBUG_LOG_LEVEL, 3);
+       level = tdm_config_get_int(TDM_CONFIG_KEY_DEBUG_LOG_LEVEL, -1);
+       if (level == -1) {
+               const char *str = getenv("TDM_DEBUG_LEVEL");
+               if (str)
+                       level = str[0] - '0';
+               else
+                       level = 3;
+       }
        tdm_log_set_debug_level(level);
 
-       level = tdm_config_get_int(TDM_CONFIG_KEY_DEBUG_ASSERT_LEVEL, 0);
+       level = tdm_config_get_int(TDM_CONFIG_KEY_DEBUG_ASSERT_LEVEL, -1);
+       if (level == -1) {
+               const char *str = getenv("TDM_ASSERT_LEVEL");
+               if (str)
+                       level = str[0] - '0';
+               else
+                       level = 0;
+       }
        tdm_log_set_assert_level(level);
 
        /* if TDM_CONFIG_KEY_DEBUG_LOG_PATH is setted, TDM_CONFIG_KEY_DEBUG_DLOG will be ignored. */
@@ -116,7 +130,14 @@ _tdm_config_check_logs(void)
                tdm_log_enable_dlog(0);
                tdm_log_set_path(path);
        } else {
-               int dlog = tdm_config_get_int(TDM_CONFIG_KEY_DEBUG_DLOG, 1);
+               int dlog = tdm_config_get_int(TDM_CONFIG_KEY_DEBUG_DLOG, -1);
+               if (dlog == -1) {
+                       const char *str = getenv("TDM_DLOG");
+                       if (str)
+                               dlog = (str[0] == '1') ? 1 : 0;
+                       else
+                               dlog = 1;
+               }
                tdm_log_enable_dlog(dlog);
        }