diff --git a/src/app/main.cpp b/src/app/main.cpp index 4f5b81b1..c5bd0369 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -29,7 +29,6 @@ void setupLogging() { - LogManager::createInstance(); LogManager* logManager = LogManager::getInstance().get(); std::shared_ptr consoleLogger = std::make_shared(); @@ -102,8 +101,6 @@ int main(int argc, char *argv[]) { QApplication::setApplicationName("Coati"); - setupLogging(); - if (QSysInfo::windowsVersion() != QSysInfo::WV_None) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); @@ -129,7 +126,7 @@ int main(int argc, char *argv[]) setupApp(argc, argv); - // setupLogging(); // why would you setup logging that late? the logger is possibly already in use before this line!! + setupLogging(); Application::createInstance(version, nullptr, nullptr); ScopedFunctor f([](){ @@ -181,7 +178,7 @@ int main(int argc, char *argv[]) setupApp(argc, argv); - // setupLogging(); // why would you setup logging that late? the logger is possibly already in use before this line!! + setupLogging(); qtApp.setAttribute(Qt::AA_UseHighDpiPixmaps); diff --git a/src/lib/utility/logging/LogManager.cpp b/src/lib/utility/logging/LogManager.cpp index 22059219..332d8c3a 100644 --- a/src/lib/utility/logging/LogManager.cpp +++ b/src/lib/utility/logging/LogManager.cpp @@ -7,20 +7,8 @@ #include "utility/messaging/type/MessageStatus.h" #include "utility/Version.h" -std::shared_ptr LogManager::createInstance() -{ - if (s_instance.use_count() == 0) - { - s_instance = std::shared_ptr(new LogManager()); - } - return s_instance; -} - -// what is this method for? why would you want to risk returning s_instance without checking whether it is initialized??? std::shared_ptr LogManager::getInstance() { - // return s_instance; // original implementation - if (s_instance.use_count() == 0) { s_instance = std::shared_ptr(new LogManager()); diff --git a/src/lib/utility/logging/LogManager.h b/src/lib/utility/logging/LogManager.h index a71a910a..35206f83 100644 --- a/src/lib/utility/logging/LogManager.h +++ b/src/lib/utility/logging/LogManager.h @@ -9,7 +9,6 @@ class LogManager { public: - static std::shared_ptr createInstance(); static std::shared_ptr getInstance(); static void destroyInstance(); diff --git a/src/test/TestSuiteFixture.cpp b/src/test/TestSuiteFixture.cpp index c2aa05a5..ec1306cb 100644 --- a/src/test/TestSuiteFixture.cpp +++ b/src/test/TestSuiteFixture.cpp @@ -20,7 +20,7 @@ TestSuiteFixture::~TestSuiteFixture() bool TestSuiteFixture::setUpWorld() { - LogManager* logManager = LogManager::createInstance().get(); + LogManager* logManager = LogManager::getInstance().get(); logManager->setLoggingEnabled(true); logManager->addLogger(std::make_shared("data/log/test_log.txt"));