Skip to content

Commit 6e7a07e

Browse files
al3xa23JitpanuM
authored andcommitted
fix(node-gateway): include output message
Signed-off-by: Alexandra <alexandra.bach@eonerc.rwth-aachen.de>
1 parent 09d33df commit 6e7a07e

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

lib/api/request.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ std::string Request::toString() {
2525

2626
Request *RequestFactory::create(Session *s, const std::string &uri,
2727
Session::Method meth, unsigned long ct) {
28-
s->logger->info("Lookup request handler for: uri={}", uri);
28+
s->logger->debug("Lookup request handler for: uri={}", uri);
2929

3030
for (auto *rf : plugin::registry->lookup<RequestFactory>()) {
3131
std::smatch mr;

lib/api/requests/gateway/grpc.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <villas/api/response.hpp>
1616
#include <villas/nodes/gateway.hpp>
1717
#include <villas/timing.hpp>
18+
#include "villas/log.hpp"
1819

1920
using namespace google::protobuf;
2021

@@ -30,7 +31,7 @@ class ReflectionClient {
3031
request.set_file_containing_symbol(symbol);
3132
bool streamstatus = stream->Write(request);
3233
if (!streamstatus)
33-
std::cout << "Server not allow reflection" << std::endl;
34+
std::cout << "Server does not allow reflection" << std::endl;
3435

3536
grpc::reflection::v1alpha::ServerReflectionResponse response;
3637
google::protobuf::FileDescriptorSet *file_descs =
@@ -167,7 +168,7 @@ class grpcRequest : public NodeRequest {
167168
db.Add(protos->file(i));
168169
}
169170
auto pool = std::make_unique<DescriptorPool>(&db);
170-
const Descriptor *resp_desc;
171+
const Descriptor *resp_desc = nullptr;
171172
// Check if server reflection complete
172173
if (protos->file_size() == 0) {
173174
server_reflection = false;
@@ -370,6 +371,7 @@ class grpcRequest : public NodeRequest {
370371
size_t dummy_wbytes;
371372
ret = gateway_node->formatter->sprint(dummy_buf, dummy_buflen,
372373
&dummy_wbytes, sample_dummy);
374+
logger->debug("gRPC Request Sample length {}", sample_dummy->length);
373375
if (ret < 0) {
374376
logger->warn("Failed to format request payload");
375377
}
@@ -482,6 +484,7 @@ class grpcRequest : public NodeRequest {
482484
Sample *sample_dummy = sample_alloc_mem(64);
483485
int ret = gateway_node->formatter->sscan(
484486
recv_data.c_str(), resp_buf.Length(), &rbytes, sample_dummy);
487+
logger->debug("gRPC Response Sample length {}", sample_dummy->length);
485488
if (ret < 0) {
486489
std::cerr << "Formatting Failed: " << ret << std::endl;
487490
}
@@ -493,10 +496,8 @@ class grpcRequest : public NodeRequest {
493496
time_to_double(&sample_dummy->ts.origin), "value",
494497
json_ch);
495498

496-
if (method == Session::PUT) {
497-
sample_copy(gateway_node->read.sample, sample_dummy);
498-
pthread_cond_signal(&gateway_node->read.cv);
499-
}
499+
sample_copy(gateway_node->read.sample, sample_dummy);
500+
pthread_cond_signal(&gateway_node->read.cv);
500501

501502
sample_free(sample_dummy);
502503
pthread_mutex_unlock(&gateway_node->read.mutex);

lib/nodes/gateway.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,15 @@ int GatewayNode::_read(struct Sample *smps[], unsigned cnt) {
5353

5454
pthread_cond_wait(&read.cv, &read.mutex);
5555
sample_copy(smps[0], read.sample);
56+
logger->debug("Gateway read sample {}", smps[0]->length);
5657

5758
return 1;
5859
}
5960

6061
int GatewayNode::_write(struct Sample *smps[], unsigned cnt) {
6162
assert(cnt == 1);
6263
sample_copy(write.sample, smps[0]);
64+
logger->debug("Gateway write sample {}", smps[0]->length);
6365

6466
int ret =
6567
formatter->sprint(write.buf, write.buflen, &write.wbytes, smps, cnt);

0 commit comments

Comments
 (0)