summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorJaehyun Kim <jeik01.kim@samsung.com>2020-10-16 16:51:48 +0900
committerJaehyun Kim <jeik01.kim@samsung.com>2020-10-16 16:53:09 +0900
commit968835a6331514c865a8a471cc6b055fcdd1f687 (patch)
tree803e805155a95339e56b363bca92aee92873d128 /src/main.c
parentb2c0ac0bd56e8070a05b7a7328fd611536c8794a (diff)
downloadconnman-968835a6331514c865a8a471cc6b055fcdd1f687.tar.gz
connman-968835a6331514c865a8a471cc6b055fcdd1f687.tar.bz2
connman-968835a6331514c865a8a471cc6b055fcdd1f687.zip
Fix an issue where the log option is not applied properly
Change-Id: Ibb5305175a1987d74f0a24ba413a664940233e76 Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>
Diffstat (limited to 'src/main.c')
-rwxr-xr-xsrc/main.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c
index 7938a069..7e638120 100755
--- a/src/main.c
+++ b/src/main.c
@@ -106,7 +106,7 @@ static struct {
char *def_wifi_ifname;
bool file_log;
bool dlog_log;
- bool simplified_log;
+ bool simple_log;
#endif
} connman_settings = {
.bg_scan = true,
@@ -139,7 +139,7 @@ static struct {
.def_wifi_ifname = DEFAULT_WIFI_INTERFACE,
.file_log = true,
.dlog_log = true,
- .simplified_log = true,
+ .simple_log = true,
#endif
};
@@ -695,7 +695,7 @@ static void check_Tizen_configuration(GKeyFile *config)
boolean = __connman_config_get_bool(config, "General",
CONF_CONNMAN_SIMPLIFIED_LOG, &error);
if (!error)
- connman_settings.simplified_log = boolean;
+ connman_settings.simple_log = boolean;
g_clear_error(&error);
@@ -940,10 +940,11 @@ static int config_init(const char *file)
parse_config(config);
if (config)
g_key_file_free(config);
+
#if defined TIZEN_EXT
- dlog_logging = connman_settings.dlog_log;
- file_logging = connman_settings.file_log;
- simplified_log = connman_settings.simplified_log;
+ set_simple_log_option(connman_settings.simple_log);
+ set_dlog_logging_option(connman_settings.dlog_log);
+ set_file_logging_option(connman_settings.file_log);
#endif
return 0;
}
@@ -1179,7 +1180,7 @@ bool connman_setting_get_bool(const char *key)
return connman_settings.dlog_log;
if (g_str_equal(key, CONF_CONNMAN_SIMPLIFIED_LOG))
- return connman_settings.simplified_log;
+ return connman_settings.simple_log;
#endif
#if defined TIZEN_EXT