Add a default behavior to logger_format_add function + tests

src/logger.c

@@ -69,6 +69,11 @@ int pyfcgi_logger_format_add(const char* format, size_t* idx)
 
 	conf = &PyFCGI_conf.logs;
 
+	if(!format)
+	{
+		format = PYFCGI_LOGGER_TIME_FMT_DEFAULT;
+	}
+
 	for(i=0; i<conf->format_sz; i++)
 	{
 		if(!strcmp(format, conf->formats[i].fmt)) { break; }

tests/check_logger.c

@@ -6,6 +6,8 @@
 
 pyfcgi_conf_logger_t *conf = &PyFCGI_conf.logs;
 
+char tmpdir[] = "./tmp_PyFCGI_checksXXXXXX";
+
 /*
 	TC logger init
 */
@@ -32,15 +34,35 @@ START_TEST(test_logger_format_add)
 	size_t s;
 	pyfcgi_logger_init();
 	const char *fmt = "{datetime} {level} {ident}[{pid}] {msg}";
+	const char *fmt2 = "{datetime} {level} {ident} {msg}";
 
 	ret = pyfcgi_logger_format_add(fmt, &s);
+	ck_assert_int_eq(ret, 0);
 	ck_assert_int_eq(conf->format_sz, 1);
 	ck_assert_int_eq(s, 0);
 	ck_assert_str_eq(conf->formats[s].fmt, fmt);
+	ret = pyfcgi_logger_format_add(fmt2, &s);
+	ck_assert_int_eq(ret, 0);
+	ck_assert_int_eq(conf->format_sz, 2);
+	ck_assert_int_eq(s, 1);
+	ck_assert_str_eq(conf->formats[s].fmt, fmt2);
+	ret = pyfcgi_logger_format_add(fmt, &s);
+	ck_assert_int_eq(ret, 0);
+	ck_assert_int_eq(conf->format_sz, 2);
+	ck_assert_int_eq(s, 0);
+	ck_assert_str_eq(conf->formats[s].fmt, fmt);
 
 }
 END_TEST
 
+START_TEST(test_logger_add)
+{
+	char tmplog[128];
+	snprintf(tmplog, 128, "%s/%s", tmpdir, "format_add.log");
+	pyfcgi_logger_add(tmplog, 0xFF, 0xFF, NULL);
+}
+END_TEST
+
 /*
 	TC logger default values
 */
@@ -117,6 +139,20 @@ START_TEST(test_logger_parse_field_datetime_default)
 }
 END_TEST
 
+START_TEST(test_logger_format_add_default)
+{
+	int ret;
+	size_t s;
+	pyfcgi_logger_init();
+
+	ret = pyfcgi_logger_format_add(NULL, &s);
+	ck_assert_int_eq(ret, 0);
+	ck_assert_int_eq(conf->format_sz, 1);
+	ck_assert_int_eq(s, 0);
+	ck_assert_str_eq(conf->formats[s].fmt, PYFCGI_LOGGER_TIME_FMT_DEFAULT);
+}
+END_TEST
+
 /*
 	TC logger field parsing
 */
@@ -476,6 +512,7 @@ Suite * logger_suite(void)
 	tcase_add_test(tc_field_default, test_logger_parse_field_dtfmt_default);
 	tcase_add_test(tc_field_default, test_logger_parse_field_sz_default);
 	tcase_add_test(tc_field_default, test_logger_parse_field_datetime_default);
+	tcase_add_test(tc_field_default, test_logger_format_add_default);
 	suite_add_tcase(s, tc_field_default);
 
 	tc_field = tcase_create("Logger format parsing");
@@ -509,6 +546,8 @@ int main(void)
 	Suite *s;
 	SRunner *sr;
 
+	mkdtemp(tmpdir);
+
 	s = logger_suite();
 	sr = srunner_create(s);
 	
@@ -518,5 +557,8 @@ int main(void)
 	srunner_run_all(sr, CK_VERBOSE);
 	nfailed = srunner_ntests_failed(sr);
 	srunner_free(sr);
+
+	rmdir(tmpdir);
+
 	return (!nfailed)?EXIT_SUCCESS:EXIT_FAILURE;
 }