Skip to content
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

When nodes had encoded values, like _, in their names, the printer sy… #186

Merged
merged 1 commit into from
Jan 24, 2025
Merged

When nodes had encoded values, like _, in their names, the printer sy… #186

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
23 changes: 15 additions & 8 deletions otsdaq/GatewaySupervisor/GatewaySupervisor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,16 +1358,23 @@ void GatewaySupervisor::AppStatusWorkLoop(GatewaySupervisor* theSupervisor)
<< "' [URL=" << appInfo.getURL() << "]." << __E__;
__COUT_ERR__ << "\n" << ss.str();

theSupervisor->theStateMachine_.setErrorMessage(ss.str());
try
//Prevent stopping state machine from failed status (for now)
// Seeing Console Crash and bring down state machine at the moment
if(!appInfo.isTypeConsoleSupervisor())
{
theSupervisor->runControlMessageHandler(
SOAPUtilities::makeSOAPMessageReference(
RunControlStateMachine::ERROR_TRANSITION_NAME));
theSupervisor->theStateMachine_.setErrorMessage(ss.str());
try
{
theSupervisor->runControlMessageHandler(
SOAPUtilities::makeSOAPMessageReference(
RunControlStateMachine::ERROR_TRANSITION_NAME));
}
catch(...)
{
} //ignore any errors
}
catch(...)
{
} //ignore any errors
else
__COUT__ << "Ignoring that Console type supervisor crashed." << __E__;

break; //only send one Error, then restart status loop
}
Expand Down
3 changes: 2 additions & 1 deletion otsdaq/TablePlugins/ARTDAQTableBase/ARTDAQTableBase.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2337,7 +2337,8 @@ const ARTDAQTableBase::ARTDAQInfo& ARTDAQTableBase::getARTDAQSystem(
for(auto& artdaqNode : it->second)
{
// check skip set
if(skipSet.find(artdaqNode.label) != skipSet.end())
if(skipSet.find(StringMacros::encodeURIComponent(artdaqNode.label)) !=
skipSet.end())
continue;

__COUT__ << "\t\t"
Expand Down
3 changes: 2 additions & 1 deletion otsdaq/WebUsersUtilities/WebUsers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3568,7 +3568,8 @@ void WebUsers::addSystemMessage(const std::vector<std::string>& targetUsers,
(subject == "" ? "" : (subject + ": ")) + message);

// Note: do not printout message, because if it was a Console trigger, it will fire repeatedly
std::cout << __COUT_HDR__ << "fullMessage: " << fullMessage << __E__;
std::cout << __COUT_HDR_FL__
<< "addSystemMessage() fullMessage: " << fullMessage << __E__;
__COUTV__(StringMacros::vectorToString(targetUsers));

std::set<std::string> targetEmails;
Expand Down
Loading