Merge branch 'main' into aditya/disable_GeoRef_console_prints

gazebosim · May 17, 2022 · 600670b · 600670b
2 parents 8bcc9d0 + d5f1c97
commit 600670b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Console.cc b/src/Console.cc
@@ -243,8 +243,10 @@ void FileLogger::Init(const std::string &_directory,
   {
     if (!env(IGN_HOMEDIR, logPath))
     {
-      ignerr << "Missing HOME environment variable."
-        << "No log file will be generated.";
+      // Use stderr here to prevent infinite recursion
+      // trying to get the log initialized
+      std::cerr << "Missing HOME environment variable."
+        << "No log file will be generated." << std::endl;
       return;
     }
     logPath = joinPaths(logPath, _directory);

diff --git a/src/Console_TEST.cc b/src/Console_TEST.cc
@@ -538,3 +538,14 @@ TEST_F(Console_TEST, LogDirectory)
 
   EXPECT_EQ(logDir, absPath);
 }
+
+/////////////////////////////////////////////////
+/// \brief Test Console::Init and Console::Log
+/// This specifically tests with an unset HOME variable
+TEST_F(Console_TEST, NoInitAndLogNoHome)
+{
+  ignLogClose();
+  EXPECT_TRUE(ignition::common::unsetenv(IGN_HOMEDIR));
+  // This should not throw
+  ignlog << "this is a test" << std::endl;
+}