Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

redis: minor stylistic improvements and fixes

Browse source
This commit is contained in:
Steffen Vogel 2022-01-11 07:40:24 -05:00
parent 6c735f4b18
commit 8cf6414295
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/nodes/redis.cpp
View file

@ -140,12 +140,16 @@ void RedisConnection::loop()
subscriber.consume();
}
catch (const sw::redis::TimeoutError &e) {
logger->debug("Timeout.");
continue;
}
catch (const sw::redis::ReplyError &e) {
logger->error("Error: {}", e.what());
continue;
}
catch (const sw::redis::Error &e) {
logger->error("Error: {}. Recreating subscriber", e.what());
/* Create a new subscriber */
subscriber = context.subscriber();
}
@ -177,9 +181,9 @@ int redis_get(NodeCompat *n, struct Sample * const smps[], unsigned cnt)
case RedisMode::HASH: {
struct Sample *smp = smps[0];
for (unsigned j = 0; j < n->getInputSignals(false)->size(); j++) {
auto sig = n->getInputSignals(false)->getByIndex(j);
auto *data = &smp->data[j];
unsigned j = 0;
for (auto sig : *n->getInputSignals(false)) {
auto *data = &smp->data[j++];
*data = sig->init;
}
@ -546,6 +550,7 @@ int villas::node::redis_start(NodeCompat *n)
int villas::node::redis_stop(NodeCompat *n)
{
int ret;
auto *r = n->getData<struct redis>();
r->conn->stop();
@ -639,7 +644,8 @@ int villas::node::redis_write(NodeCompat *n, struct Sample * const smps[], unsig
std::unordered_map<std::string, std::string> kvs;
for (unsigned j = 0; j < MIN(smp->signals->size(), smp->length); j++) {
unsigned len = MIN(smp->signals->size(), smp->length);
for (unsigned j = 0; j < len; j++) {
const auto sig = smp->signals->getByIndex(j);
const auto *data = &smp->data[j];