Remove the global logging level.

It's incompatible with having a logger that logs everything, regardless of
the global log level.

1 files changed, 4 insertions, 63 deletions

diff --git a/lib/common/Test.cpp b/lib/common/Test.cpp
index de87c465..bfa7bcb0 100644
--- a/lib/common/Test.cpp
+++ b/lib/common/Test.cpp
@@ -230,14 +230,7 @@ int WaitForServerStartup(const char *pidFile, int pidIfKnown)
 	#endif
 
 	// time for it to start up
-	if (Logging::GetGlobalLevel() >= Log::TRACE)
-	{
-		BOX_TRACE("Waiting for server to start");
-	}
-	else
-	{
-		::fprintf(stdout, "Waiting for server to start: ");
-	}
+	BOX_TRACE("Waiting for server to start");
 
 	for (int i = 0; i < 15; i++)
 	{
@@ -251,12 +244,6 @@ int WaitForServerStartup(const char *pidFile, int pidIfKnown)
 			break;
 		}
 
-		if (Logging::GetGlobalLevel() < Log::TRACE)
-		{
-			::fprintf(stdout, ".");
-			::fflush(stdout);
-		}
-
 		::sleep(1);
 	}
 
@@ -265,42 +252,17 @@ int WaitForServerStartup(const char *pidFile, int pidIfKnown)
 
 	if (pidIfKnown && !ServerIsAlive(pidIfKnown))
 	{
-		if (Logging::GetGlobalLevel() >= Log::TRACE)
-		{
-			BOX_ERROR("server died!");
-		}
-		else
-		{
-			::fprintf(stdout, " server died!\n");
-		}
-
 		TEST_FAIL_WITH_MESSAGE("Server died!");	
 		return -1;
 	}
 
 	if (!TestFileNotEmpty(pidFile))
 	{
-		if (Logging::GetGlobalLevel() >= Log::TRACE)
-		{
-			BOX_ERROR("timed out!");
-		}
-		else
-		{
-			::fprintf(stdout, " timed out!\n");
-		}
-
 		TEST_FAIL_WITH_MESSAGE("Server didn't save PID file");	
 		return -1;
 	}
 
-	if (Logging::GetGlobalLevel() >= Log::TRACE)
-	{
-		BOX_TRACE("Server started");
-	}
-	else
-	{
-		::fprintf(stdout, " done.\n");
-	}
+	BOX_TRACE("Server started");
 
 	// wait a second for the pid to be written to the file
 	::sleep(1);
@@ -419,35 +381,14 @@ void terminate_bbackupd(int pid)
 // Wait a given number of seconds for something to complete
 void wait_for_operation(int seconds, const char* message)
 {
-	if (Logging::GetGlobalLevel() >= Log::TRACE)
-	{
-		BOX_TRACE("Waiting " << seconds << " seconds for " << message);
-	}
-	else
-	{
-		printf("Waiting for %s: ", message);
-		fflush(stdout);
-	}
+	BOX_TRACE("Waiting " << seconds << " seconds for " << message);
 
 	for(int l = 0; l < seconds; ++l)
 	{
 		sleep(1);
-		if (Logging::GetGlobalLevel() < Log::TRACE)
-		{
-			printf(".");
-			fflush(stdout);
-		}
 	}
 
-	if (Logging::GetGlobalLevel() >= Log::TRACE)
-	{
-		BOX_TRACE("Finished waiting for " << message);
-	}
-	else
-	{
-		printf(" done.\n");
-		fflush(stdout);
-	}
+	BOX_TRACE("Finished waiting for " << message);
 }
 
 void safe_sleep(int seconds)