epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pvalink: control parse warnings with logging

Browse Source
This commit is contained in:
Michael Davidsaver
2025-02-17 20:11:41 -08:00
parent 0ec2d3f6be
commit f2e49a8844
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ioc/pvalink_jlif.cpp
+16 -12
View File
@@ -6,6 +6,8 @@
#include <sstream>
#include <pvxs/log.h>
#include "qsrvpvt.h"
#include "pvalink.h"
#include <epicsStdio.h> // redirects stdout/stderr
@@ -17,6 +19,8 @@ pvaLinkConfig::~pvaLinkConfig() {}
namespace {
DEFINE_LOGGER(logj, "pvxs.ioc.link.parse");
/* link options.
*
* "pvname" # short-hand, sets PV name only
@@ -73,8 +77,8 @@ jlif_result pva_parse_null(jlink *pjlink) noexcept
pvt->sevr = pvaLinkConfig::NMS;
} else if(pvt->jkey == "local") {
pvt->local = false; // alias for local:false
} else if(pvt->debug) {
printf("pva link parsing unknown none depth=%u key=\"%s\"\n",
} else {
log_warn_printf(logj, "pva link parsing unknown none depth=%u key=\"%s\"\n",
pvt->parseDepth, pvt->jkey.c_str());
}
@@ -107,8 +111,8 @@ jlif_result pva_parse_bool(jlink *pjlink, int val) noexcept
pvt->always = !!val;
} else if(pvt->jkey == "atomic") {
pvt->atomic = !!val;
} else if(pvt->debug) {
printf("pva link parsing unknown integer depth=%u key=\"%s\" value=%s\n",
} else {
log_warn_printf(logj, "pva link parsing unknown integer depth=%u key=\"%s\" value=%s\n",
pvt->parseDepth, pvt->jkey.c_str(), val ? "true" : "false");
}
@@ -126,8 +130,8 @@ jlif_result pva_parse_integer(jlink *pjlink, long long val) noexcept
pvt->queueSize = val < 1 ? 1 : size_t(val);
} else if(pvt->jkey == "monorder") {
pvt->monorder = std::max(-1024, std::min(int(val), 1024));
} else if(pvt->debug) {
printf("pva link parsing unknown integer depth=%u key=\"%s\" value=%lld\n",
} else {
log_warn_printf(logj, "pva link parsing unknown integer depth=%u key=\"%s\" value=%lld\n",
pvt->parseDepth, pvt->jkey.c_str(), val);
}
@@ -160,8 +164,8 @@ jlif_result pva_parse_string(jlink *pjlink, const char *val, size_t len) noexcep
pvt->proc = pvaLinkConfig::PP;
} else if(sval=="NPP") {
pvt->proc = pvaLinkConfig::NPP;
} else if(pvt->debug) {
printf("pva link parsing unknown proc depth=%u key=\"%s\" value=\"%s\"\n",
} else {
log_warn_printf(logj, "pva link parsing unknown proc depth=%u key=\"%s\" value=\"%s\"\n",
pvt->parseDepth, pvt->jkey.c_str(), sval.c_str());
}
@@ -177,13 +181,13 @@ jlif_result pva_parse_string(jlink *pjlink, const char *val, size_t len) noexcep
// leave room for this to happen compatibly later by
// handling as alias for MS until then.
pvt->sevr = pvaLinkConfig::MS;
} else if(pvt->debug) {
printf("pva link parsing unknown sevr depth=%u key=\"%s\" value=\"%s\"\n",
} else {
log_warn_printf(logj, "pva link parsing unknown sevr depth=%u key=\"%s\" value=\"%s\"\n",
pvt->parseDepth, pvt->jkey.c_str(), sval.c_str());
}
} else if(pvt->debug) {
printf("pva link parsing unknown string depth=%u key=\"%s\" value=\"%s\"\n",
} else {
log_warn_printf(logj, "pva link parsing unknown string depth=%u key=\"%s\" value=\"%s\"\n",
pvt->parseDepth, pvt->jkey.c_str(), sval.c_str());
}