Removed force_flush arg from everywhere. Use flush_on(level) instead
This commit is contained in:
		@@ -18,7 +18,26 @@ TEST_CASE("simple_file_logger", "[simple_logger]]")
 | 
			
		||||
    logger->flush();
 | 
			
		||||
    REQUIRE(file_contents(filename) == std::string("Test message 1\nTest message 2\n"));
 | 
			
		||||
    REQUIRE(count_lines(filename) == 2);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
TEST_CASE("flush_on", "[flush_on]]")
 | 
			
		||||
{
 | 
			
		||||
	prepare_logdir();
 | 
			
		||||
	std::string filename = "logs/simple_log.txt";
 | 
			
		||||
 | 
			
		||||
	auto logger = spdlog::create<spdlog::sinks::simple_file_sink_mt>("logger", filename);
 | 
			
		||||
	logger->set_pattern("%v");
 | 
			
		||||
	logger->set_level(spdlog::level::trace);
 | 
			
		||||
	logger->flush_on(spdlog::level::info);
 | 
			
		||||
	logger->trace("Should not be flushed");
 | 
			
		||||
	REQUIRE(count_lines(filename) == 0);
 | 
			
		||||
 | 
			
		||||
	logger->info("Test message {}", 1);
 | 
			
		||||
	logger->info("Test message {}", 2);
 | 
			
		||||
	logger->flush();
 | 
			
		||||
	REQUIRE(file_contents(filename) == std::string("Should not be flushed\nTest message 1\nTest message 2\n"));
 | 
			
		||||
	REQUIRE(count_lines(filename) == 3);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
TEST_CASE("rotating_file_logger1", "[rotating_logger]]")
 | 
			
		||||
@@ -26,15 +45,13 @@ TEST_CASE("rotating_file_logger1", "[rotating_logger]]")
 | 
			
		||||
    prepare_logdir();
 | 
			
		||||
    std::string basename = "logs/rotating_log";
 | 
			
		||||
    auto logger = spdlog::rotating_logger_mt("logger", basename, 1024, 0);
 | 
			
		||||
    logger->flush_on(spdlog::level::info);
 | 
			
		||||
    
 | 
			
		||||
    for (int i = 0; i < 10; ++i)
 | 
			
		||||
        logger->info("Test message {}", i);
 | 
			
		||||
 | 
			
		||||
	logger->flush();
 | 
			
		||||
    auto filename = basename + ".txt";
 | 
			
		||||
    REQUIRE(count_lines(filename) == 10);
 | 
			
		||||
    for (int i = 0; i < 1000; i++)
 | 
			
		||||
        logger->info("Test message {}", i);
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -61,7 +78,6 @@ TEST_CASE("rotating_file_logger2", "[rotating_logger]]")
 | 
			
		||||
 | 
			
		||||
TEST_CASE("daily_logger", "[daily_logger]]")
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
    prepare_logdir();
 | 
			
		||||
    //calculate filename (time based)
 | 
			
		||||
    std::string basename = "logs/daily_log";
 | 
			
		||||
@@ -92,10 +108,10 @@ TEST_CASE("daily_logger with dateonly calculator", "[daily_logger_dateonly]]")
 | 
			
		||||
    fmt::MemoryWriter w;
 | 
			
		||||
    w.write("{}_{:04d}-{:02d}-{:02d}.txt", basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
 | 
			
		||||
 | 
			
		||||
    auto logger = spdlog::create<sink_type>("logger", basename, "txt", 0, 0, true);
 | 
			
		||||
    auto logger = spdlog::create<sink_type>("logger", basename, "txt", 0, 0);
 | 
			
		||||
    for (int i = 0; i < 10; ++i)
 | 
			
		||||
        logger->info("Test message {}", i);
 | 
			
		||||
 | 
			
		||||
	logger->flush();
 | 
			
		||||
    auto filename = w.str();
 | 
			
		||||
    REQUIRE(count_lines(filename) == 10);
 | 
			
		||||
}
 | 
			
		||||
@@ -124,11 +140,12 @@ TEST_CASE("daily_logger with custom calculator", "[daily_logger_custom]]")
 | 
			
		||||
    fmt::MemoryWriter w;
 | 
			
		||||
    w.write("{}{:04d}{:02d}{:02d}.txt", basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
 | 
			
		||||
 | 
			
		||||
    auto logger = spdlog::create<sink_type>("logger", basename, "txt", 0, 0, true);
 | 
			
		||||
    auto logger = spdlog::create<sink_type>("logger", basename, "txt", 0, 0);
 | 
			
		||||
    for (int i = 0; i < 10; ++i)
 | 
			
		||||
        logger->info("Test message {}", i);
 | 
			
		||||
 | 
			
		||||
    auto filename = w.str();
 | 
			
		||||
	logger->flush();
 | 
			
		||||
    auto filename = w.str();	
 | 
			
		||||
    REQUIRE(count_lines(filename) == 10);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user