Skip to content

v2.26.2 #284

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

Merged
sy-c merged 2 commits into from
Oct 18, 2024
Merged

v2.26.2 #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea841a5
exit requests are not fatal
sy-c Oct 17, 2024
67edf36
v2.26.2
sy-c Oct 18, 2024
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
3 changes: 3 additions & 0 deletions doc/releaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,3 +642,6 @@ This file describes the main feature changes for each readout.exe released versi

## v2.26.1 - 20/08/2024
- Fixed missing details in "invalid RDH" log messages.

## v2.26.2 - 18/10/2024
- Fixed spurious fatal log message when stopping a readout process by system signal (when running outside of ECS control, e.g. CTP readout server).
2 changes: 1 addition & 1 deletion src/ReadoutVersion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#define READOUT_VERSION "2.26.1"
#define READOUT_VERSION "2.26.2"

6 changes: 3 additions & 3 deletions src/mainReadout.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ class Readout
}

// Wrapper function to catch exception and report fatal errors
int executeFunction(std::string actionName, std::function<int()> f) {
int executeFunction(std::string actionName, std::function<int()> f, int plusZeroIsFatal = 1, int minusZeroIsFatal = 1) {
// theLog.log(LogDebugDevel, "Calling function for %s",actionName.c_str());
int err = -1;
try {
Expand All @@ -326,7 +326,7 @@ class Readout
catch (const std::exception& e) {
theLog.log(LogErrorSupport_(3245), "Exception : %s", e.what());
}
if (err) {
if ( ((err<0)&&(minusZeroIsFatal)) || ((err>0)&&(plusZeroIsFatal)) ) {
std::vector<std::string> m;
theLog.historyGetSummary(m);
std::string reason = "Readout failed in " + actionName + ". Please check previous messages.";
Expand Down Expand Up @@ -355,7 +355,7 @@ class Readout
return executeFunction("STOP", std::bind(&Readout::_stop, this));
}
int iterateRunning() {
return executeFunction("RUNNING", std::bind(&Readout::_iterateRunning, this));
return executeFunction("RUNNING", std::bind(&Readout::_iterateRunning, this), 0, 1); // special handling of positive error code: not fatal
}
int iterateCheck() {
return executeFunction("CHECK", std::bind(&Readout::_iterateCheck, this));
Expand Down