Skip to content

[Helper] Replace console message handler instantiation with singleton usage #5978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alxbilger wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −8
Open

[Helper] Replace console message handler instantiation with singleton usage #5978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MessageHandlerComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void MessageHandlerComponent::parse ( core::objectmodel::BaseObjectDescription*
const string stype(type) ;

if(stype=="sofa"){
MessageDispatcher::addHandler(new ConsoleMessageHandler()) ;
MessageDispatcher::addHandler(&sofa::helper::logging::MainConsoleMessageHandler::getInstance()) ;
}else if(stype=="clang"){
MessageDispatcher::addHandler(new ClangMessageHandler()) ;
}else if(stype=="rich"){
Expand Down
8 changes: 3 additions & 5 deletions Sofa/framework/Helper/src/sofa/helper/logging/MessageDispatcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,9 @@ namespace sofa::helper::logging
/// some of them are duplicated
/// other get a weak reference

std::vector<MessageHandler*> getDefaultMessageHandlers(){
std::vector<MessageHandler*> messageHandlers;
static ConsoleMessageHandler s_consoleMessageHandler(&DefaultStyleMessageFormatter::getInstance());
messageHandlers.push_back(&s_consoleMessageHandler);
return messageHandlers;
std::vector<MessageHandler*> getDefaultMessageHandlers()
{
return { &sofa::helper::logging::MainConsoleMessageHandler::getInstance() };
}

class MessageDispatcherImpl
Expand Down
4 changes: 2 additions & 2 deletions applications/projects/runSofa/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ int main(int argc, char** argv)
if (messageHandler == "auto" )
{
MessageDispatcher::clearHandlers() ;
MessageDispatcher::addHandler( new ConsoleMessageHandler() ) ;
MessageDispatcher::addHandler( &sofa::helper::logging::MainConsoleMessageHandler::getInstance() ) ;
}
else if (messageHandler == "clang")
{
Expand All @@ -348,7 +348,7 @@ int main(int argc, char** argv)
else if (messageHandler == "sofa")
{
MessageDispatcher::clearHandlers() ;
MessageDispatcher::addHandler( new ConsoleMessageHandler() ) ;
MessageDispatcher::addHandler( &sofa::helper::logging::MainConsoleMessageHandler::getInstance() ) ;
}
else if (messageHandler == "rich")
{
Expand Down
Loading