noselasd/libucore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adhere to coding style in logging module (struct uc_log_destination->

Browse Source 
struct UCLogDestination, and similar for other structs)
This commit is contained in:
Nils O. Selåsdal
2014-01-07 23:39:01 +01:00
parent 74b6a65bd2
commit 0e2d4f07c3
5 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/logging.c
+3 -3
View File
@@ -6,7 +6,7 @@ enum {
CC,
HO
};
struct uc_log_module module_arr[] = {
struct UCLogModule module_arr[] = {
{
MAIN,
"MAIN",
@@ -28,14 +28,14 @@ struct uc_log_module module_arr[] = {
}
};
struct uc_log_modules modules = {
struct UCLogModules modules = {
.mods = module_arr,
.cnt = ARRAY_SIZE(module_arr),
};
int main(int argc, char *argv[])
{
struct uc_log_destination *dest;
struct UCLogDestination *dest;
uc_log_init(&modules);
dest = uc_log_new_file("test.log", UC_LL_INFO, 1);
uc_log_add_destination(dest);
test/test_logging.c
+42 -42
View File
@@ -32,18 +32,18 @@ static void logging_rm_subdir(void)
START_TEST (test_logfile_location)
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_DEBUG,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct stat st;
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int rc;
uc_log_init(&mods);
@@ -66,18 +66,18 @@ END_TEST
START_TEST (test_logfile_delete_destination)
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_DEBUG,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct stat st;
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int rc;
uc_log_init(&mods);
@@ -114,18 +114,18 @@ END_TEST
START_TEST (test_logfile_no_location)
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_DEBUG,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct stat st;
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int rc;
uc_log_init(&mods);
@@ -144,18 +144,18 @@ END_TEST
START_TEST (test_logfile_loglevel_surpressed_dest)
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_DEBUG,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct stat st;
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int rc;
uc_log_init(&mods);
@@ -176,19 +176,19 @@ END_TEST
START_TEST (test_logfile_loglevel_surpressed_module)
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
//file destination have UC_LL_WARNING, so nothing should be logged
.log_level = UC_LL_WARNING,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct stat st;
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int rc;
uc_log_init(&mods);
@@ -208,18 +208,18 @@ END_TEST
START_TEST (test_logfile_reopen_files)
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_DEBUG,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct stat st;
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int rc;
uc_log_init(&mods);
@@ -251,18 +251,18 @@ END_TEST
START_TEST (test_logfile_remove_dest)
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_DEBUG,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct stat st;
struct uc_log_destination *dest1, *dest2;
struct UCLogDestination *dest1, *dest2;
int rc;
uc_log_init(&mods);
@@ -296,17 +296,17 @@ END_TEST
START_TEST (test_logfile_full_filesystem)
//logging to a full filesystem shouldn't crash
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_DEBUG,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int i;
@@ -326,17 +326,17 @@ END_TEST
START_TEST (test_logfile_invalid_file)
//check behavior when a log file cannot be opened
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_DEBUG,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct uc_log_destination *dest;
struct UCLogDestination *dest;
uc_log_init(&mods);
@@ -347,17 +347,17 @@ END_TEST
START_TEST (test_logfile_invalid_file_after_reopen)
//check behavior when a log file cannot be re-opened
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_DEBUG,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int rc;
uc_log_init(&mods);
@@ -386,18 +386,18 @@ END_TEST
START_TEST (test_logfile_raw)
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_DEBUG,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct stat st;
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int rc;
uc_log_init(&mods);
@@ -416,7 +416,7 @@ END_TEST
START_TEST (test_logfile_dest_mask)
struct uc_log_module m[] = {
struct UCLogModule m[] = {
{
.id = 0,
.short_name = "MOD1",
@@ -430,12 +430,12 @@ START_TEST (test_logfile_dest_mask)
.log_level = UC_LL_WARNING,
}
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = m,
.cnt = 2,
};
struct stat st;
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int rc;
uc_log_init(&mods);
@@ -462,18 +462,18 @@ END_TEST
START_TEST (test_loglevel_module_none)
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_NONE,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct stat st;
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int rc;
uc_log_init(&mods);
@@ -491,18 +491,18 @@ END_TEST
START_TEST (test_loglevel_dest_none)
struct uc_log_module m = {
struct UCLogModule m = {
.id = 0,
.short_name = "MOD1",
.long_name = "Module 1",
.log_level = UC_LL_DEBUG,
};
struct uc_log_modules mods = {
struct UCLogModules mods = {
.mods = &m,
.cnt = 1,
};
struct stat st;
struct uc_log_destination *dest;
struct UCLogDestination *dest;
int rc;
uc_log_init(&mods);
test/udp_heartbeat.c
+3 -3
View File
@@ -25,7 +25,7 @@
#define PEER_HB_SEC 5
#define PEER_HB_MISS 3
static struct uc_log_module modules[] = {
static struct UCLogModule modules[] = {
{
.id = LMAIN,
.short_name = "MAIN",
@@ -34,7 +34,7 @@ static struct uc_log_module modules[] = {
}
};
static struct uc_log_modules log_modules = {
static struct UCLogModules log_modules = {
.mods = modules,
.cnt = ARRAY_SIZE(modules)
};
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
uint16_t local_port = 23456;
uint16_t remote_port = 23456;
int c;
struct uc_log_destination *dest;
struct UCLogDestination *dest;
srand(getpid());