Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/github-actions/linux-build_and_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if [[ "$DO_BUILD" == "yes" ]] ; then
fi

echo "~~~~~~ RUNNING TESTS ~~~~~~~~"
make CTEST_OUTPUT_ON_FAILURE=1 test ARGS="-T Test --output-on-failure -j${NUM_BUILD_PROCS}"
or_die make CTEST_OUTPUT_ON_FAILURE=1 test ARGS="-T Test --output-on-failure -j${NUM_BUILD_PROCS}"

if [[ "${DO_BENCHMARKS}" == "yes" ]] ; then
echo "~~~~~~ RUNNING BENCHMARKS ~~~~~~~~"
Expand Down
16 changes: 10 additions & 6 deletions src/axom/slic/core/Logger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,33 @@ namespace axom
{
namespace slic
{
//------------------------------------------------------------------------------
// Slic's singleton state, scope-limited to this file.
//
// Defined the singleton state at namespace scope so its destructors are registered
// late and runs early during teardown.
//------------------------------------------------------------------------------

using Loggermap = std::map<std::string, Logger*>;

//------------------------------------------------------------------------------
// This is a singleton, scope-limited to this file.
static Loggermap s_loggers;
Loggermap& getLoggers()
{
static Loggermap s_loggers;
return s_loggers;
}

//------------------------------------------------------------------------------
// This is a singleton, scope-limited to this file.
static Logger* s_Logger = nullptr;
Logger*& getLogger()
{
static Logger* s_Logger = nullptr;
return s_Logger;
}

//------------------------------------------------------------------------------
// This is a singleton, scope-limited to this file.
static LogStreamStatusMonitor s_logStreamStatusMonitor;
LogStreamStatusMonitor& getLogStreamStatusMonitor()
{
static LogStreamStatusMonitor s_logStreamStatusMonitor;
return s_logStreamStatusMonitor;
}

Expand Down
Loading