Skip to content

Dontmerge comment out logs #6

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
rerpha merged 2 commits into from
Oct 18, 2024
Merged

Dontmerge comment out logs #6

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
4e9a266
this sort of fixes the issue
rerpha Oct 18, 2024
b7350f4
remove uncommented LOG_ERR lines
rerpha 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
10 changes: 6 additions & 4 deletions adsApp/src/ADSPortDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,10 +329,11 @@ asynStatus ADSPortDriver::ADSConnect(asynUser *pasynUser) {
status = static_cast<asynStatus>(
adsConnection->resolve_variables(ads_read_vars));

if (status) {
if (status && lastReadError != status) {
LOG_ERR_ASYN(pasynUser,
"Could not resolve ADS read variable names (%i): %s",
status, ads_errors[status].c_str());
lastReadError = status;
return status;
}
}
Expand All @@ -341,11 +342,11 @@ asynStatus ADSPortDriver::ADSConnect(asynUser *pasynUser) {
status = static_cast<asynStatus>(
adsConnection->resolve_variables(ads_write_vars));

if (status && lastError != status) {
if (status && lastWriteError != status) {
LOG_ERR_ASYN(pasynUser,
"Could not resolve ADS write variable names(%i): %s",
status, ads_errors[status].c_str());
lastError = status;
lastWriteError = status;
return status;
}
}
Expand All @@ -354,10 +355,11 @@ asynStatus ADSPortDriver::ADSConnect(asynUser *pasynUser) {

// initialize sum-read buffers
status = static_cast<asynStatus>(SumRead.initialize());
if (status) {
if (status && lastSumReadError != status) {
LOG_ERR_ASYN(pasynUser,
"Error initializing sum-read request buffers (%i): %s",
status, ads_errors[status].c_str());
lastSumReadError = status;
return status;
}

Expand Down
4 changes: 3 additions & 1 deletion adsApp/src/ADSPortDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ class ADSPortDriver : public Autoparam::Driver {
uint32_t const adsFunctionTimeout;
const std::shared_ptr<Connection> adsConnection;
const std::chrono::milliseconds sumReadPeriod;
long lastError;
long lastReadError;
long lastWriteError;
long lastSumReadError;

SumReadRequest SumRead;

Expand Down
8 changes: 4 additions & 4 deletions adsApp/src/err.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
LOG_MSG_ASYN(asyn_user, ASYN_TRACE_ERROR, "ERROR", format, ##__VA_ARGS__)

#define LOG_WARN_ASYN(asyn_user, format, ...) \
LOG_MSG_ASYN(asyn_user, ASYN_TRACE_WARNING, "WARNING", format, ##__VA_ARGS__)
//LOG_MSG_ASYN(asyn_user, ASYN_TRACE_WARNING, "WARNING", format, ##__VA_ARGS__)

#define LOG_TRACE_ASYN(asyn_user, format, ...) \
LOG_MSG_ASYN(asyn_user, ASYN_TRACE_FLOW, "TRACE", format, ##__VA_ARGS__)
//LOG_MSG_ASYN(asyn_user, ASYN_TRACE_FLOW, "TRACE", format, ##__VA_ARGS__)

/* Error logging macros for use when asyn_user is not available */
#define LOG_MSG(log_level_str, format, ...) \
Expand All @@ -45,10 +45,10 @@
LOG_MSG("ERROR", format, ##__VA_ARGS__)

#define LOG_WARN(format, ...) \
LOG_MSG("WARNING", format, ##__VA_ARGS__)
//LOG_MSG("WARNING", format, ##__VA_ARGS__)

#define LOG_TRACE(format, ...) \
LOG_MSG("TRACE", format, ##__VA_ARGS__)
//LOG_MSG("TRACE", format, ##__VA_ARGS__)

/* EPICS ADS specific return codes */
#define EPICSADS_BASE 1000
Expand Down