projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3329 from efuss/fix-3311
[collectd.git]
/
src
/
grpc.cc
diff --git
a/src/grpc.cc
b/src/grpc.cc
index
314e9b0
..
d9577a4
100644
(file)
--- a/
src/grpc.cc
+++ b/
src/grpc.cc
@@
-41,8
+41,8
@@
extern "C" {
#include <stdbool.h>
#include "collectd.h"
#include <stdbool.h>
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include "daemon/utils_cache.h"
}
#include "daemon/utils_cache.h"
}
@@
-241,7
+241,7
@@
static grpc::Status unmarshal_meta_data(const grpcMetadata &rpc_metadata,
*md_out = meta_data_create();
if (*md_out == nullptr) {
return grpc::Status(grpc::StatusCode::RESOURCE_EXHAUSTED,
*md_out = meta_data_create();
if (*md_out == nullptr) {
return grpc::Status(grpc::StatusCode::RESOURCE_EXHAUSTED,
- grpc::string("failed to metadata list"));
+ grpc::string("failed to
create
metadata list"));
}
for (auto kv : rpc_metadata) {
auto k = kv.first.c_str();
}
for (auto kv : rpc_metadata) {
auto k = kv.first.c_str();
@@
-664,7
+664,7
@@
static int c_grpc_config_listen(oconfig_item_t *ci) {
}
pkcp.cert_chain = read_file(cert);
} else if (!strcasecmp("VerifyPeer", child->key)) {
}
pkcp.cert_chain = read_file(cert);
} else if (!strcasecmp("VerifyPeer", child->key)) {
-
_Bool verify = 0
;
+
bool verify = false
;
if (cf_util_get_boolean(child, &verify)) {
return -1;
}
if (cf_util_get_boolean(child, &verify)) {
return -1;
}
@@
-747,7
+747,8
@@
static int c_grpc_config_server(oconfig_item_t *ci) {
auto callback_name = grpc::string("grpc/") + addr;
user_data_t ud = {
auto callback_name = grpc::string("grpc/") + addr;
user_data_t ud = {
- .data = client, .free_func = c_grpc_destroy_write_callback,
+ .data = client,
+ .free_func = c_grpc_destroy_write_callback,
};
plugin_register_write(callback_name.c_str(), c_grpc_write, &ud);
};
plugin_register_write(callback_name.c_str(), c_grpc_write, &ud);