diff options
| author | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-08-24 01:32:38 -0400 |
|---|---|---|
| committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-08-24 01:32:38 -0400 |
| commit | 84b4ac572954c3fbf114a877f00a12020d3b31f8 (patch) | |
| tree | 4b257caf10eb6e7dfd2113671a7ebdcd845dcf3b /src/core/core.cpp | |
| parent | bed0c3c92a6db45b29e787016fd21542606a031a (diff) | |
logging: Fix log filter during initialization
The log filter was being ignored on initialization due to the logging instance being initialized before the config instance, so the log filter was set to its default value.
This fixes that oversight, along with using descriptive exceptions instead of abort() calls.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index b0dc594d48..5893a86bf0 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -4,6 +4,7 @@ #include <array> #include <atomic> +#include <exception> #include <memory> #include <utility> @@ -423,9 +424,16 @@ struct System::Impl { System::System() : impl{std::make_unique<Impl>(*this)} {} System::~System() = default; +System& System::GetInstance() { + if (!s_instance) { + throw std::runtime_error("Using System instance before its initialization"); + } + return *s_instance; +} + void System::InitializeGlobalInstance() { if (s_instance) { - abort(); + throw std::runtime_error("Reinitializing Global System instance."); } s_instance = std::unique_ptr<System>(new System); } |