From: Marcin Niesluchowski Date: Tue, 18 Jun 2013 13:50:38 +0000 (+0200) Subject: Reducing error logs number. X-Git-Tag: submit/tizen_2.2/20130714.151203~7^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ba7729d7a6fe099aa455961fd791eaab0e26f00;p=framework%2Fsecurity%2Flibprivilege-control.git Reducing error logs number. [Issue#] SSDWSSP-331 [Bug/Feature] Too many error logs. [Cause] N/A [Solution] N/A [Verification] Running tests. Change-Id: I7a5516b0cd68d9217db2da9ba185d6cc9536b9dc --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 26a1d68..e9881a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,7 @@ ADD_DEFINITIONS("-DHOMEDIR=${HOMEDIR}") ADD_DEFINITIONS("-Wall -Werror") #ADD_DEFINITIONS("-DDLOG_DEBUG_ENABLED") #enables dlogutil logs +ADD_DEFINITIONS("-DDLOG_WARN_ENABLED") ADD_DEFINITIONS("-DDLOG_ERROR_ENABLED") ################################################################################################### diff --git a/include/common.h b/include/common.h index 6c21d1f..cb952e1 100644 --- a/include/common.h +++ b/include/common.h @@ -40,6 +40,13 @@ #define C_LOGD(...) do { } while(0) #endif //DDLOG_DEBUG_ENABLED +// conditional log macro for dlogutil (warning) +#ifdef DLOG_WARN_ENABLED +#define C_LOGW(...) LOGW(__VA_ARGS__) +#else +#define C_LOGW(...) do { } while(0) +#endif //DLOG_WARN_ENABLED + // conditional log macro for dlogutil (error) #ifdef DLOG_ERROR_ENABLED #define C_LOGE(...) LOGE(__VA_ARGS__) diff --git a/src/access-db.c b/src/access-db.c index 38e9a3d..e74d7af 100644 --- a/src/access-db.c +++ b/src/access-db.c @@ -317,7 +317,7 @@ int get_app_gids(const char *app_id, unsigned **gids, int *len) if (isdigit(*field)) { gid = gid * 10 + *field - '0'; } else { - C_LOGE("Invalid line read: %s", fields[i]); + C_LOGE("Invalid line read in groups database: %s", fields[i]); ret = PC_ERR_FILE_OPERATION; goto out; } diff --git a/src/common.c b/src/common.c index 418ddb3..1767fe7 100644 --- a/src/common.c +++ b/src/common.c @@ -51,7 +51,7 @@ int smack_label_is_valid(const char* smack_label) return 1; err: - C_LOGE("Invalid Smack label: %s", smack_label); + C_LOGD("Invalid Smack label: %s", smack_label); return 0; } diff --git a/src/privilege-control.c b/src/privilege-control.c index 4ccad20..93876c7 100644 --- a/src/privilege-control.c +++ b/src/privilege-control.c @@ -410,7 +410,7 @@ static int set_dac(const char *smack_label, const char *pkg_name) C_LOGD("get group information"); if(!(fp_group = fopen(usr.group_list, "r"))) { - C_LOGE("[ERR] file open error: [%s]\n", usr.group_list); + C_LOGE("File open error: %s", usr.group_list); result = PC_ERR_FILE_OPERATION; // return -1 goto error; } @@ -421,7 +421,7 @@ static int set_dac(const char *smack_label, const char *pkg_name) temp_gid = strtoul(buf, 0, 10); if(errno != 0) // error occured during strtoul() { - C_LOGE("[ERR] cannot change string to integer: [%s]", buf); + C_LOGE("Cannot change string to integer: %s", buf); result = PC_ERR_INVALID_OPERATION; goto error; } @@ -472,7 +472,7 @@ static int set_dac(const char *smack_label, const char *pkg_name) C_LOGD("setgroups()"); if(setgroups(glist_cnt, glist) != 0) { - C_LOGE("[ERR] setgrouops fail\n"); + C_LOGE("setgrouops fail"); result = PC_ERR_NOT_PERMITTED; // return -3 goto error; } @@ -488,13 +488,13 @@ static int set_dac(const char *smack_label, const char *pkg_name) C_LOGD("setgid( %d ) & setuid( %d )", usr.gid, usr.uid); if(setgid(usr.gid) != 0) // fail { - C_LOGE("[ERR] fail to execute setgid()."); + C_LOGE("Fail to execute setgid()."); result = PC_ERR_INVALID_OPERATION; goto error; } if(setuid(usr.uid) != 0) // fail { - C_LOGE("[ERR] fail to execute setuid()."); + C_LOGE("Fail to execute setuid()."); result = PC_ERR_INVALID_OPERATION; goto error; } @@ -502,20 +502,20 @@ static int set_dac(const char *smack_label, const char *pkg_name) SECURE_LOGD("setenv(): USER = %s, HOME = %s", usr.user_name, usr.home_dir); if(setenv("USER", usr.user_name, 1) != 0) //fail { - C_LOGE("[ERR] fail to execute setenv() [USER]."); + C_LOGE("Fail to execute setenv() [USER]."); result = PC_ERR_INVALID_OPERATION; goto error; } if(setenv("HOME", usr.home_dir, 1) != 0) // fail { - C_LOGE("[ERR] fail to execute setenv() [HOME]."); + C_LOGE("Fail to execute setenv() [HOME]."); result = PC_ERR_INVALID_OPERATION; goto error; } } else // current user is not only 'root' but 'app' { - C_LOGE("[ERR] current user is NOT root\n"); + C_LOGE("Current user is NOT root"); result = PC_ERR_NOT_PERMITTED; // return -3 goto error; } @@ -714,7 +714,7 @@ static void mark_rules_as_loaded(const char *app_id) FILE *file = NULL; if(smack_mark_file_name(app_id, &path)) { - C_LOGE("Error in smack_mark_file_name"); + C_LOGW("Warning: smack_mark_file_name failed"); return; } @@ -751,7 +751,7 @@ API int set_app_privilege(const char* name, const char* type, const char* path) C_LOGD("This is first run of this application. Adding SMACK rules"); ret = add_app_first_run_rules(smack_label); if (ret != PC_OPERATION_SUCCESS ) { - C_LOGE("Error while add_app_first_run_rules"); + C_LOGW("Warning: add_app_first_run_rules failed"); // should we return here with error code? } mark_rules_as_loaded(smack_label); @@ -924,7 +924,7 @@ static int perm_to_smack(struct smack_accesses* smack, const char* app_label, ap file = fopen(path, "r"); C_LOGD("path = %s", path); if (file == NULL) { - C_LOGE("fopen failed"); + C_LOGW("fopen failed"); return PC_OPERATION_SUCCESS; } @@ -962,7 +962,7 @@ static int perm_to_dac(const char* app_label, app_type_t app_type, const char* p file = fopen(path, "r"); C_LOGD("path = %s", path); if (file == NULL) { - C_LOGE("fopen failed"); + C_LOGW("fopen failed"); return PC_OPERATION_SUCCESS; } @@ -1530,7 +1530,7 @@ static int app_revoke_permissions_internal(const char* app_id, bool persistent) } if (persistent && ftruncate(fd, 0) == -1) - C_LOGE("file truncate failed"); + C_LOGW("file truncate failed"); return PC_OPERATION_SUCCESS; }