Merge pull request #900 from ccin2p3/faxmodem/cpu-numcpu

[collectd.git] / src / grpc.cc

diff --git a/src/grpc.cc b/src/grpc.cc
index 53b8fa5..a38abc1 100644 (file)
--- a/src/grpc.cc
+++ b/src/grpc.cc
@@ -40,7 +40,6 @@ extern "C" {
 
 #include "collectd.h"
 #include "common.h"
-#include "configfile.h"
 #include "plugin.h"
 
 #include "daemon/utils_cache.h"
@@ -264,15 +263,15 @@ class CollectdImpl : public collectd::Collectd::Service {
 public:
        grpc::Status QueryValues(grpc::ServerContext *ctx, QueryValuesRequest const *req, grpc::ServerWriter<QueryValuesResponse> *writer) override {
                value_list_t match;
-               auto err = unmarshal_ident(req->identifier(), &match, false);
-               if (!err.ok()) {
-                       return err;
+               auto status = unmarshal_ident(req->identifier(), &match, false);
+               if (!status.ok()) {
+                       return status;
                }
 
                std::queue<value_list_t> value_lists;
-               err = this->queryValuesRead(&match, &value_lists);
-               if (err.ok()) {
-                       err = this->queryValuesWrite(ctx, writer, &value_lists);
+               status = this->queryValuesRead(&match, &value_lists);
+               if (status.ok()) {
+                       status = this->queryValuesWrite(ctx, writer, &value_lists);
                }
 
                while (!value_lists.empty()) {
@@ -281,7 +280,7 @@ public:
                        sfree(vl.values);
                }
 
-               return err;
+               return status;
        }
 
        grpc::Status DispatchValues(grpc::ServerContext *ctx,
@@ -356,9 +355,9 @@ private:
                        QueryValuesResponse res;
                        res.Clear();
 
-                       auto err = marshal_value_list(&vl, res.mutable_value_list());
-                       if (!err.ok()) {
-                               return err;
+                       auto status = marshal_value_list(&vl, res.mutable_value_list());
+                       if (!status.ok()) {
+                               return status;
                        }
 
                        if (!writer->Write(res)) {