refactor: Centralize error output

src/coreComponents/codingUtilities/Parsing.hpp

@@ -91,7 +91,7 @@ char const * parseBuffer( char const * first,
  * @param issep function that returns true if given character is a value separator
  * @return @p last if the entire buffer has been processed, or pointer to
  *         the start of the unprocessed part if a parsing error occurred
- * @throws std::runtime_error if file IO or parsing error occurred
+ * @throws geos::RuntimeError if file IO or parsing error occurred
  */
 template< typename CONTAINER, typename SEPFUNC >
 void parseFile( string const & filename,
@@ -134,13 +134,13 @@ void parseFile( string const & filename,
       GEOS_THROW( GEOS_FMT( "Unable to parse value in file {} at position {}: {}...",
                             filename, static_cast< std::streamoff >( inputStream.tellg() ) - left,
                             string( ptr, std::min( left, std::ptrdiff_t{32} ) ) ),
-                  std::runtime_error );
+                  geos::RuntimeError );
     }
   }
 
   GEOS_THROW_IF( inputStream.fail() && !inputStream.eof(),
                  GEOS_FMT( "Error while reading file {}: {}", filename, std::strerror( errno ) ),
-                 std::runtime_error );
+                 geos::RuntimeError );
 }
 
 } // namespace geos

src/coreComponents/codingUtilities/tests/testParsing.cpp

@@ -140,7 +140,7 @@ class ParsingTest : public ::testing::TestWithParam< T >
 
     geos::stdVector< T > vec;
     auto const issep_invalid = []( char const c ){ return c == '|'; };
-    EXPECT_THROW( geos::parseFile( fname, vec, issep_invalid ), std::runtime_error );
+    EXPECT_THROW( geos::parseFile( fname, vec, issep_invalid ), geos::RuntimeError );
 
     std::remove( fname.c_str() );
   }

src/coreComponents/common/CMakeLists.txt

@@ -38,6 +38,7 @@ set( common_headers
      GEOS_RAJA_Interface.hpp
      GeosxMacros.hpp
      MemoryInfos.hpp
+     logger/GeosExceptions.hpp
      logger/Logger.hpp
      logger/ErrorHandling.hpp
      logger/ExternalErrorHandler.hpp

src/coreComponents/common/Path.cpp

@@ -140,7 +140,7 @@ void makeDirectory( std::string const & path )
 {
   constexpr mode_t mode = 0770; // user and group rwx permissions
   int const err = mkdir( path.c_str(), mode );
-  GEOS_THROW_IF( err && ( errno != EEXIST ), "Failed to create directory: " << path, std::runtime_error );
+  GEOS_THROW_IF( err && ( errno != EEXIST ), "Failed to create directory: " << path, geos::RuntimeError );
 }
 
 void makeDirsForPath( std::string const & path )

src/coreComponents/common/format/table/TableLayout.hpp

@@ -20,10 +20,8 @@
 #ifndef GEOS_COMMON_FORMAT_TABLE_TABLELAYOUT_HPP
 #define GEOS_COMMON_FORMAT_TABLE_TABLELAYOUT_HPP
 
-#include "common/DataTypes.hpp"
 #include "TableTypes.hpp"
 #include <variant>
-#include "common/logger/Logger.hpp"
 
 
 namespace geos

src/coreComponents/common/format/table/TableTypes.hpp

@@ -23,6 +23,8 @@
 #ifndef GEOS_COMMON_FORMAT_TABLETYPES_HPP
 #define GEOS_COMMON_FORMAT_TABLETYPES_HPP
 
+#include "common/DataTypes.hpp"
+
 namespace geos
 {
 

src/coreComponents/common/initializeEnvironment.cpp

@@ -102,22 +102,16 @@ void setupLogger()
 
       std::string const stackHistory = LvArray::system::stackTrace( true );
 
-      GEOS_LOG( GEOS_FMT( "***** ERROR\n"
-                          "***** LOCATION: (external error, detected {})\n"
-                          "{}\n{}",
-                          detectionLocation, errorMsg, stackHistory ) );
-      if( ErrorLogger::global().isOutputFileEnabled() )
-      {
-        ErrorLogger::ErrorMsg error;
-        error.setType( ErrorLogger::MsgType::Error );
-        error.addToMsg( errorMsg );
-        error.addRank( ::geos::logger::internal::g_rank );
-        error.addCallStackInfo( stackHistory );
-        error.addContextInfo(
-          ErrorContext{ { { ErrorContext::Attribute::DetectionLoc, string( detectionLocation ) } } } );
-
-        ErrorLogger::global().flushErrorMsg( error );
-      }
+      ErrorLogger::global().beginLogger()
+        .setType( ErrorLogger::MsgType::Error )
+        .addToMsg( errorMsg )
+        .addRank( ::geos::logger::internal::g_rank )
+        .addCallStackInfo( stackHistory )
+        .addContextInfo(
+        ErrorContext{  string( detectionLocation ),
+                       { { ErrorContext::Attribute::DetectionLoc, string( detectionLocation ) } },
+        } )
+        .flush();
 
       // we do not terminate the program as 1. the error could be non-fatal, 2. there may be more messages to output.
     } );
@@ -134,26 +128,16 @@ void setupLogger()
 
       // error message output
       std::string const stackHistory = LvArray::system::stackTrace( true );
-      ErrorLogger::ErrorMsg error;
-      error.addSignalToMsg( signal );
-
-      GEOS_LOG( GEOS_FMT( "***** ERROR\n"
-                          "***** SIGNAL: {}\n"
-                          "***** LOCATION: (external error, captured by signal handler)\n"
-                          "{}\n{}",
-                          signal, error.m_msg, stackHistory ) );
 
-      if( ErrorLogger::global().isOutputFileEnabled() )
-      {
-        error.setType( ErrorLogger::MsgType::Error );
-        error.addRank( ::geos::logger::internal::g_rank );
-        error.addCallStackInfo( stackHistory );
-        error.addContextInfo(
-          ErrorContext{ { { ErrorContext::Attribute::Signal, std::to_string( signal ) } }, 1 },
-          ErrorContext{ { { ErrorContext::Attribute::DetectionLoc, string( "signal handler" ) } }, 0 } );
-
-        ErrorLogger::global().flushErrorMsg( error );
-      }
+      ErrorLogger::global().beginLogger()
+        .addSignalToMsg( signal )
+        .setType( ErrorLogger::MsgType::Error )
+        .addRank( ::geos::logger::internal::g_rank )
+        .addCallStackInfo( stackHistory )
+        .addContextInfo(
+        ErrorContext{ { { ErrorContext::Attribute::Signal, std::to_string( signal ) } }, 1 },
+        ErrorContext{ { { ErrorContext::Attribute::DetectionLoc, string( "signal handler" ) } }, 0 } )
+        .flush();
 
       // call program termination
       LvArray::system::callErrorHandler();