Skip to content

Rrivera/fix config dump send #406

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
rrivera747 wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Rrivera/fix config dump send #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
99bad0f
Adding retransmission mode to an acknowledge()
rrivera747 May 7, 2026
bcab137
Added sendAll() to Transceiver class as well
rrivera747 May 7, 2026
86753b2
Merge branch 'develop' into rrivera/fixConfigDumpSend
rrivera747 May 7, 2026
a25d861
Format fix
rrivera747 May 7, 2026
409ec3b
Checkpoint in log checking improvement; extraction of compile aliases…
rrivera747 May 14, 2026
847be7a
Missing file
rrivera747 May 14, 2026
ff62df6
Merge branch 'rrivera/betterLogChecking' into rrivera/fixConfigDumpSend
rrivera747 May 14, 2026
be2259d
Log searching checkpoint
rrivera747 May 15, 2026
9080b30
Checkpoint in adding delete log feature
rrivera747 May 18, 2026
25c07cc
Working for -l option
rrivera747 May 18, 2026
695f4e7
Now launches log search in parallel
rrivera747 May 18, 2026
60d3948
Checkpoint with log search/deleting
rrivera747 May 19, 2026
4a42af4
Better message severity; better handling of vless on multiple network…
rrivera747 May 21, 2026
08fcd2d
Better log err/warn handling for ots -le and -lw
rrivera747 May 21, 2026
75ef9ae
Checkpoint in improving handling of disk rates and alarms, and in log…
May 22, 2026
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
38 changes: 31 additions & 7 deletions otsdaq/ConfigurationInterface/ConfigurationManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4311,8 +4311,7 @@ void ConfigurationManager::initializeFromFhicl(const std::string& fhiclPath)
table->setActiveView(TableVersion(TableVersion::DEFAULT));

TableView* view = table->getViewP();
__GEN_COUT__ << "Activated version: " << view->getVersion() << __E__;
// view->print();
__GEN_COUT__ << "Activated version: " << view->getVersion() << __E__;

// add context record ---------------------
view->addRow();
Expand All @@ -4324,7 +4323,12 @@ void ConfigurationManager::initializeFromFhicl(const std::string& fhiclPath)
view->setValue("1", 0, colMap[TableViewColumnInfo::COL_NAME_STATUS]);

__GEN_COUT__ << "Done adding context record..." << __E__;
view->print();
if(TTEST(1))
{
std::stringstream ss;
view->print(ss);
__GEN_COUTT__ << "view->print()" << ss.str() << __E__;
}

} // done with context record

Expand All @@ -4346,7 +4350,6 @@ void ConfigurationManager::initializeFromFhicl(const std::string& fhiclPath)

TableView* view = table->getViewP();
__GEN_COUT__ << "Activated version: " << view->getVersion() << __E__;
// view->print();

// add application record ---------------------
view->addRow();
Expand All @@ -4360,7 +4363,12 @@ void ConfigurationManager::initializeFromFhicl(const std::string& fhiclPath)
view->setValue(__ENV__("FE_SUPERVISOR_ID"), 0, colMap["Id"]); // XDAQ LID

__GEN_COUT__ << "Done adding application record..." << __E__;
view->print();
if(TTEST(1))
{
std::stringstream ss;
view->print(ss);
__GEN_COUTT__ << "view->print()" << ss.str() << __E__;
}
} // done with app record

// create FE Supervisor table and Supervisor record
Expand All @@ -4380,7 +4388,6 @@ void ConfigurationManager::initializeFromFhicl(const std::string& fhiclPath)

TableView* view = table->getViewP();
__GEN_COUT__ << "Activated version: " << view->getVersion() << __E__;
// view->print();

// add application record ---------------------
view->addRow();
Expand All @@ -4392,7 +4399,12 @@ void ConfigurationManager::initializeFromFhicl(const std::string& fhiclPath)
"MacroMakerFESupervisorInterfaces", 0, colMap["LinkToFEInterfaceGroupID"]);

__GEN_COUT__ << "Done adding supervisor record..." << __E__;
view->print();
if(TTEST(1))
{
std::stringstream ss;
view->print(ss);
__GEN_COUTT__ << "view->print()" << ss.str() << __E__;
}
} // done with app record

// create FE Interface table and interface record(s)
Expand Down Expand Up @@ -4972,6 +4984,18 @@ ConfigurationManager::getOtherSubsystemActiveTableGroups(
ss << userDataPath << __E__;
__SS_ONLY_THROW__;
}
else if(cmdResult.find("No such file or directory") != std::string::npos)
{
__GEN_SS__
<< "\n\nActive tables groups file not found at user data path specified for subsystem '"
<< otherSubsystemUID << "': ";
if(username != "")
ss << username << "@";
if(hostname != "")
ss << hostname << ":";
ss << userDataPath << __E__;
__SS_ONLY_THROW__;
}

auto subsystemActiveGroupMap = StringMacros::getVectorFromString(
cmdResult, {'\n'} /* delimieter*/, {' ', '\t'} /* whitespace*/);
Expand Down
5 changes: 5 additions & 0 deletions otsdaq/FECore/FEVInterface.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,10 @@ void FEVInterface::registerFEMacroFunction(
__FE_SS_THROW__;
}

__FE_COUTT__ << "Registering FE Macro Function: '" << feMacroName
<< "' with requiredUserPermissions=" << requiredUserPermissions
<< " allowedCallingFEs=" << allowedCallingFEs << __E__;

mapOfFEMacroFunctions_.insert(std::pair<std::string, frontEndMacroStruct_t>(
feMacroName,
frontEndMacroStruct_t(feMacroName,
Expand All @@ -933,6 +937,7 @@ void FEVInterface::registerFEMacroFunction(
requiredUserPermissions,
allowedCallingFEs,
feMacroTooltip)));

} // end registerFEMacroFunction()

//==============================================================================
Expand Down
Loading
Loading