minor beatification of log messages (#19135)
Costa Tsaousis committed
Dec 6, 2024 at 01:37 UTC
3ad2f6b41c340a473efa56fe4cda891d4763eaf0
8 files changed
+91
-49
src/ml/ml.cc
+4
-4
@@ -1140,8 +1140,8 @@ static enum ml_worker_result ml_worker_create_new_model(ml_worker_t *worker, ml_
1140
AcquiredDimension AcqDim(req.DLI);
1141
1142
if (!AcqDim.acquired()) {
1143
- netdata_log_error("Failed to create new model: could not acquire dimension (machine-guid: %s, dimension: '%s.%s')",
1144
- req.DLI.machineGuid(), req.DLI.chartId(), req.DLI.dimensionId());
1143
+ netdata_log_error("Failed to create new model: could not acquire dimension (machine-guid: %s, dimension: '%s.%s', reason: %s)",
1144
+ req.DLI.machineGuid(), req.DLI.chartId(), req.DLI.dimensionId(), AcqDim.acquire_failure());
1145
return ML_WORKER_RESULT_NULL_ACQUIRED_DIMENSION;
1146
}
1147
@@ -1156,8 +1156,8 @@ static enum ml_worker_result ml_worker_add_existing_model(ml_worker_t *worker, m
1156
AcquiredDimension AcqDim(req.DLI);
1157
1158
if (!AcqDim.acquired()) {
1159
- netdata_log_error("Failed to add existing model: could not acquire dimension (machine-guid: %s, dimension: '%s.%s')",
1160
- req.DLI.machineGuid(), req.DLI.chartId(), req.DLI.dimensionId());
1159
+ netdata_log_error("Failed to add existing model: could not acquire dimension (machine-guid: %s, dimension: '%s.%s', reason: %s)",
1160
+ req.DLI.machineGuid(), req.DLI.chartId(), req.DLI.dimensionId(), AcqDim.acquire_failure());
1161
return ML_WORKER_RESULT_NULL_ACQUIRED_DIMENSION;
1162
}
1163
src/plugins.d/pluginsd_internals.c
+11
-3
@@ -14,8 +14,12 @@ ssize_t send_to_plugin(const char *txt, PARSER *parser) {
14
spinlock_lock(&parser->writer.spinlock);
15
16
ND_SOCK tmp = { .fd = parser->fd_output, };
17
+ const char *destination = "child";
18
ND_SOCK *s = parser->sock; // try the socket
18
- if(!s) s = &tmp; // socket is not there, use the pipe
19
+ if(!s) {
20
+ destination = "plugin";
21
+ s = &tmp; // socket is not there, use the pipe
22
+ }
23
24
if(s->fd != -1) {
25
// plugins pipe or socket (with or without SSL)
@@ -23,7 +27,9 @@ ssize_t send_to_plugin(const char *txt, PARSER *parser) {
27
size_t total = strlen(txt);
28
ssize_t bytes = nd_sock_write_persist(s, txt, total, 100);
29
if(bytes < (ssize_t)total) {
26
- netdata_log_error("PLUGINSD: cannot send command (fd = %d, bytes = %zd out of %zu)", s->fd, bytes, total);
30
+ nd_log(NDLS_DAEMON, NDLP_WARNING,
31
+ "PLUGINSD: cannot send command to %s (fd = %d, sent bytes = %zd out of %zu)",
32
+ destination, s->fd, bytes, total);
33
spinlock_unlock(&parser->writer.spinlock);
34
return -3;
35
}
@@ -33,7 +39,9 @@ ssize_t send_to_plugin(const char *txt, PARSER *parser) {
39
}
40
41
spinlock_unlock(&parser->writer.spinlock);
36
- netdata_log_error("PLUGINSD: cannot send command (no output socket/pipe/file given to plugins.d parser)");
42
+ nd_log(NDLS_DAEMON, NDLP_WARNING,
43
+ "PLUGINSD: cannot send command to %s (probably the receiver got disconnected, since no output descriptor is available)",
44
+ destination);
45
return -4;
46
}
47
src/streaming/protocol/commands.c
+6
-2
@@ -24,13 +24,17 @@ RRDSET_STREAM_BUFFER stream_send_metrics_init(RRDSET *st, time_t wall_clock_time
24
25
if(unlikely(!(host_flags & RRDHOST_FLAG_STREAM_SENDER_LOGGED_STATUS))) {
26
rrdhost_flag_set(host, RRDHOST_FLAG_STREAM_SENDER_LOGGED_STATUS);
27
- nd_log_daemon(NDLP_NOTICE, "STREAM %s [send]: not ready - collected metrics are not sent to parent.", rrdhost_hostname(host));
27
+ nd_log(NDLS_DAEMON, NDLP_INFO,
28
+ "STREAM SEND %s: connected but streaming is not ready yet...",
29
+ rrdhost_hostname(host));
30
}
31
32
return (RRDSET_STREAM_BUFFER) { .wb = NULL, };
33
}
34
else if(unlikely(host_flags & RRDHOST_FLAG_STREAM_SENDER_LOGGED_STATUS)) {
33
- nd_log_daemon(NDLP_INFO, "STREAM %s [send]: sending metrics to parent...", rrdhost_hostname(host));
35
+ nd_log(NDLS_DAEMON, NDLP_INFO,
36
+ "STREAM SEND %s: streaming is ready, sending metrics to parent...",
37
+ rrdhost_hostname(host));
38
rrdhost_flag_clear(host, RRDHOST_FLAG_STREAM_SENDER_LOGGED_STATUS);
39
}
40
src/streaming/stream-handshake.c
+1
-1
@@ -37,7 +37,7 @@ static struct {
37
{STREAM_HANDSHAKE_DISCONNECT_NOT_SUFFICIENT_SENDER_SEND_BUFFER, "DISCONNECTED NOT SUFFICIENT SEND BUFFER"},
38
{STREAM_HANDSHAKE_DISCONNECT_SOCKET_EOF, "DISCONNECTED SOCKET EOF"},
39
{STREAM_HANDSHAKE_DISCONNECT_SOCKET_READ_FAILED, "DISCONNECTED SOCKET READ FAILED"},
40
- {STREAM_HANDSHAKE_DISCONNECT_SOCKET_READ_TIMEOUT, "DISCONNECTED SOCKET READ TIMEOUT"},
40
+ {STREAM_HANDSHAKE_DISCONNECT_SOCKET_TIMEOUT, "DISCONNECTED SOCKET TIMEOUT"},
41
{STREAM_HANDSHAKE_DISCONNECT_SOCKET_ERROR, "DISCONNECT SOCKET ERROR"},
42
{STREAM_HANDSHAKE_DISCONNECT_SOCKET_WRITE_FAILED, "DISCONNECTED SOCKET WRITE FAILED"},
43
{STREAM_HANDSHAKE_DISCONNECT_SOCKET_CLOSED_BY_PARENT, "DISCONNECTED SOCKET CLOSED BY PARENT"},
src/streaming/stream-handshake.h
+1
-1
@@ -71,7 +71,7 @@ typedef enum {
71
STREAM_HANDSHAKE_DISCONNECT_NOT_SUFFICIENT_SENDER_SEND_BUFFER = -25,
72
STREAM_HANDSHAKE_DISCONNECT_SOCKET_EOF = -26,
73
STREAM_HANDSHAKE_DISCONNECT_SOCKET_READ_FAILED = -27,
74
- STREAM_HANDSHAKE_DISCONNECT_SOCKET_READ_TIMEOUT = -28,
74
+ STREAM_HANDSHAKE_DISCONNECT_SOCKET_TIMEOUT = -28,
75
STREAM_HANDSHAKE_DISCONNECT_SOCKET_ERROR = -29,
76
STREAM_HANDSHAKE_DISCONNECT_SOCKET_WRITE_FAILED = -30,
77
STREAM_HANDSHAKE_DISCONNECT_SOCKET_CLOSED_BY_PARENT = -31,
src/streaming/stream-receiver-connection.c
+58
-28
@@ -25,12 +25,12 @@ void stream_receiver_log_status(struct receiver_state *rpt, const char *msg, con
25
, (rpt->machine_guid && *rpt->machine_guid) ? rpt->machine_guid : ""
26
, msg);
27
28
- nd_log(NDLS_DAEMON, priority, "STREAM_RECEIVER for '%s': %s %s%s%s"
28
+ nd_log(NDLS_DAEMON, priority, "STREAM RECEIVE '%s': %s %s%s%s"
29
, (rpt->hostname && *rpt->hostname) ? rpt->hostname : ""
30
, msg
31
, rpt->exit.reason != STREAM_HANDSHAKE_NEVER?" (":""
32
, stream_handshake_error_to_string(rpt->exit.reason)
33
- , rpt->exit.reason != STREAM_HANDSHAKE_NEVER?")":""
33
+ , rpt->exit.reason != STREAM_HANDSHAKE_NEVER?")":""
34
);
35
}
36
@@ -139,8 +139,7 @@ static bool stream_receiver_send_first_response(struct receiver_state *rpt) {
139
stream_receiver_log_status(
140
rpt,
141
"failed to find/create host structure, rejecting connection",
142
- STREAM_STATUS_INTERNAL_SERVER_ERROR,
143
- NDLP_ERR);
142
+ STREAM_STATUS_INTERNAL_SERVER_ERROR, NDLP_ERR);
143
144
stream_send_error_on_taken_over_connection(rpt, START_STREAMING_ERROR_INTERNAL_ERROR);
145
return false;
@@ -148,7 +147,9 @@ static bool stream_receiver_send_first_response(struct receiver_state *rpt) {
147
148
if (unlikely(rrdhost_flag_check(host, RRDHOST_FLAG_PENDING_CONTEXT_LOAD))) {
149
stream_receiver_log_status(
151
- rpt, "host is initializing, retry later", STREAM_STATUS_INITIALIZATION_IN_PROGRESS, NDLP_NOTICE);
150
+ rpt,
151
+ "host is initializing, retry later",
152
+ STREAM_STATUS_INITIALIZATION_IN_PROGRESS, NDLP_NOTICE);
153
154
stream_send_error_on_taken_over_connection(rpt, START_STREAMING_ERROR_INITIALIZATION);
155
return false;
@@ -159,7 +160,9 @@ static bool stream_receiver_send_first_response(struct receiver_state *rpt) {
160
161
if(!rrdhost_set_receiver(host, rpt)) {
162
stream_receiver_log_status(
162
- rpt, "host is already served by another receiver", STREAM_STATUS_DUPLICATE_RECEIVER, NDLP_INFO);
163
+ rpt,
164
+ "host is already served by another receiver",
165
+ STREAM_STATUS_DUPLICATE_RECEIVER, NDLP_INFO);
166
167
stream_send_error_on_taken_over_connection(rpt, START_STREAMING_ERROR_ALREADY_STREAMING);
168
return false;
@@ -215,7 +218,7 @@ static bool stream_receiver_send_first_response(struct receiver_state *rpt) {
218
// remove the non-blocking flag from the socket
219
if(sock_delnonblock(rpt->sock.fd) < 0)
220
nd_log(NDLS_DAEMON, NDLP_ERR,
218
- "STREAM '%s' [receive from [%s]:%s]: cannot remove the non-blocking flag from socket %d",
221
+ "STREAM RECEIVE '%s' [from [%s]:%s]: cannot remove the non-blocking flag from socket %d",
222
rrdhost_hostname(rpt->host), rpt->client_ip, rpt->client_port, rpt->sock.fd);
223
224
struct timeval timeout;
@@ -223,7 +226,7 @@ static bool stream_receiver_send_first_response(struct receiver_state *rpt) {
226
timeout.tv_usec = 0;
227
if (unlikely(setsockopt(rpt->sock.fd, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof timeout) != 0))
228
nd_log(NDLS_DAEMON, NDLP_ERR,
226
- "STREAM '%s' [receive from [%s]:%s]: cannot set timeout for socket %d",
229
+ "STREAM RECEIVE '%s' [from [%s]:%s]: cannot set timeout for socket %d",
230
rrdhost_hostname(rpt->host), rpt->client_ip, rpt->client_port, rpt->sock.fd);
231
}
232
@@ -238,7 +241,9 @@ static bool stream_receiver_send_first_response(struct receiver_state *rpt) {
241
if(bytes_sent != (ssize_t)strlen(initial_response)) {
242
internal_error(true, "Cannot send response, got %zd bytes, expecting %zu bytes", bytes_sent, strlen(initial_response));
243
stream_receiver_log_status(
241
- rpt, "cannot reply back, dropping connection", STREAM_STATUS_CANT_REPLY, NDLP_ERR);
244
+ rpt,
245
+ "cannot reply back, dropping connection",
246
+ STREAM_STATUS_CANT_REPLY, NDLP_ERR);
247
rrdhost_clear_receiver(rpt);
248
return false;
249
}
@@ -354,7 +359,7 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
359
rpt->capabilities = convert_stream_version_to_capabilities(1, NULL, false);
360
361
if (unlikely(rrdhost_set_system_info_variable(rpt->system_info, name, value))) {
357
- nd_log_daemon(NDLP_NOTICE, "STREAM '%s' [receive from [%s]:%s]: "
362
+ nd_log_daemon(NDLP_NOTICE, "STREAM RECEIVE '%s' [from [%s]:%s]: "
363
"request has parameter '%s' = '%s', which is not used."
364
, (rpt->hostname && *rpt->hostname) ? rpt->hostname : "-"
365
, rpt->client_ip, rpt->client_port
@@ -383,7 +388,9 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
388
389
if(!rpt->key || !*rpt->key) {
390
stream_receiver_log_status(
386
- rpt, "request without an API key, rejecting connection", STREAM_STATUS_NO_API_KEY, NDLP_WARNING);
391
+ rpt,
392
+ "request without an API key, rejecting connection",
393
+ STREAM_STATUS_NO_API_KEY, NDLP_WARNING);
394
395
stream_receiver_free(rpt);
396
return stream_receiver_response_permission_denied(w);
@@ -391,7 +398,9 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
398
399
if(!rpt->hostname || !*rpt->hostname) {
400
stream_receiver_log_status(
394
- rpt, "request without a hostname, rejecting connection", STREAM_STATUS_NO_HOSTNAME, NDLP_WARNING);
401
+ rpt,
402
+ "request without a hostname, rejecting connection",
403
+ STREAM_STATUS_NO_HOSTNAME, NDLP_WARNING);
404
405
stream_receiver_free(rpt);
406
return stream_receiver_response_permission_denied(w);
@@ -402,7 +411,9 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
411
412
if(!rpt->machine_guid || !*rpt->machine_guid) {
413
stream_receiver_log_status(
405
- rpt, "request without a machine GUID, rejecting connection", STREAM_STATUS_NO_MACHINE_GUID, NDLP_WARNING);
414
+ rpt,
415
+ "request without a machine GUID, rejecting connection",
416
+ STREAM_STATUS_NO_MACHINE_GUID, NDLP_WARNING);
417
418
stream_receiver_free(rpt);
419
return stream_receiver_response_permission_denied(w);
@@ -415,8 +426,7 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
426
stream_receiver_log_status(
427
rpt,
428
"API key is not a valid UUID (use the command uuidgen to generate one)",
418
- STREAM_STATUS_INVALID_API_KEY,
419
- NDLP_WARNING);
429
+ STREAM_STATUS_INVALID_API_KEY, NDLP_WARNING);
430
431
stream_receiver_free(rpt);
432
return stream_receiver_response_permission_denied(w);
@@ -424,7 +434,9 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
434
435
if (regenerate_guid(rpt->machine_guid, buf) == -1) {
436
stream_receiver_log_status(
427
- rpt, "machine GUID is not a valid UUID", STREAM_STATUS_INVALID_MACHINE_GUID, NDLP_WARNING);
437
+ rpt,
438
+ "machine GUID is not a valid UUID",
439
+ STREAM_STATUS_INVALID_MACHINE_GUID, NDLP_WARNING);
440
441
stream_receiver_free(rpt);
442
return stream_receiver_response_permission_denied(w);
@@ -432,7 +444,10 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
444
}
445
446
if(!stream_conf_is_key_type(rpt->key, "api")) {
435
- stream_receiver_log_status(rpt, "API key is a machine GUID", STREAM_STATUS_INVALID_API_KEY, NDLP_WARNING);
447
+ stream_receiver_log_status(
448
+ rpt,
449
+ "API key is a machine GUID",
450
+ STREAM_STATUS_INVALID_API_KEY, NDLP_WARNING);
451
452
stream_receiver_free(rpt);
453
return stream_receiver_response_permission_denied(w);
@@ -441,7 +456,10 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
456
// the default for api keys is false, so that users
457
// have to enable them manually
458
if(!stream_conf_api_key_is_enabled(rpt->key, false)) {
444
- stream_receiver_log_status(rpt, "API key is not enabled", STREAM_STATUS_API_KEY_DISABLED, NDLP_WARNING);
459
+ stream_receiver_log_status(
460
+ rpt,
461
+ "API key is not enabled",
462
+ STREAM_STATUS_API_KEY_DISABLED, NDLP_WARNING);
463
464
stream_receiver_free(rpt);
465
return stream_receiver_response_permission_denied(w);
@@ -449,7 +467,9 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
467
468
if(!stream_conf_api_key_allows_client(rpt->key, w->client_ip)) {
469
stream_receiver_log_status(
452
- rpt, "API key is not allowed from this IP", STREAM_STATUS_NOT_ALLOWED_IP, NDLP_WARNING);
470
+ rpt,
471
+ "API key is not allowed from this IP",
472
+ STREAM_STATUS_NOT_ALLOWED_IP, NDLP_WARNING);
473
474
stream_receiver_free(rpt);
475
return stream_receiver_response_permission_denied(w);
@@ -457,7 +477,9 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
477
478
if (!stream_conf_is_key_type(rpt->machine_guid, "machine")) {
479
stream_receiver_log_status(
460
- rpt, "machine GUID is an API key", STREAM_STATUS_INVALID_MACHINE_GUID, NDLP_WARNING);
480
+ rpt,
481
+ "machine GUID is an API key",
482
+ STREAM_STATUS_INVALID_MACHINE_GUID, NDLP_WARNING);
483
484
stream_receiver_free(rpt);
485
return stream_receiver_response_permission_denied(w);
@@ -467,7 +489,9 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
489
// have to enable them manually
490
if(!stream_conf_api_key_is_enabled(rpt->machine_guid, true)) {
491
stream_receiver_log_status(
470
- rpt, "machine GUID is not enabled", STREAM_STATUS_MACHINE_GUID_DISABLED, NDLP_WARNING);
492
+ rpt,
493
+ "machine GUID is not enabled",
494
+ STREAM_STATUS_MACHINE_GUID_DISABLED, NDLP_WARNING);
495
496
stream_receiver_free(rpt);
497
return stream_receiver_response_permission_denied(w);
@@ -475,7 +499,9 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
499
500
if(!stream_conf_api_key_allows_client(rpt->machine_guid, w->client_ip)) {
501
stream_receiver_log_status(
478
- rpt, "machine GUID is not allowed from this IP", STREAM_STATUS_NOT_ALLOWED_IP, NDLP_WARNING);
502
+ rpt,
503
+ "machine GUID is not allowed from this IP",
504
+ STREAM_STATUS_NOT_ALLOWED_IP, NDLP_WARNING);
505
506
stream_receiver_free(rpt);
507
return stream_receiver_response_permission_denied(w);
@@ -484,7 +510,10 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
510
if (strcmp(rpt->machine_guid, localhost->machine_guid) == 0) {
511
stream_receiver_takeover_web_connection(w, rpt);
512
487
- stream_receiver_log_status(rpt, "machine GUID is my own", STREAM_STATUS_LOCALHOST, NDLP_DEBUG);
513
+ stream_receiver_log_status(
514
+ rpt,
515
+ "machine GUID is my own",
516
+ STREAM_STATUS_LOCALHOST, NDLP_DEBUG);
517
518
char initial_response[HTTP_HEADER_SIZE + 1];
519
snprintfz(initial_response, HTTP_HEADER_SIZE, "%s", START_STREAMING_ERROR_SAME_LOCALHOST);
@@ -492,10 +521,8 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
521
if(nd_sock_send_timeout(&rpt->sock, initial_response, strlen(initial_response), 0, 60) !=
522
(ssize_t)strlen(initial_response)) {
523
495
- nd_log_daemon(NDLP_ERR, "STREAM '%s' [receive from [%s]:%s]: "
496
- "failed to reply."
497
- , rpt->hostname
498
- , rpt->client_ip, rpt->client_port
524
+ nd_log_daemon(NDLP_ERR, "STREAM RECEIVE '%s' [from [%s]:%s]: failed to reply.",
525
+ rpt->hostname, rpt->client_ip, rpt->client_port
526
);
527
}
528
@@ -608,7 +635,10 @@ int stream_receiver_accept_connection(struct web_client *w, char *decoded_query_
635
if(stream_receiver_send_first_response(rpt)) {
636
// we are the receiver of the node
637
611
- stream_receiver_log_status(rpt, "connected and ready to receive data", STREAM_STATUS_CONNECTED, NDLP_INFO);
638
+ stream_receiver_log_status(
639
+ rpt,
640
+ "connected and ready to receive data",
641
+ STREAM_STATUS_CONNECTED, NDLP_INFO);
642
643
// in case we have cloud connection we inform cloud a new child connected
644
schedule_node_state_update(rpt->host, 300);
src/streaming/stream-receiver.c
+8
-8
@@ -377,12 +377,12 @@ static void stream_receiver_on_disconnect(struct stream_thread *sth __maybe_unus
377
378
{
379
char msg[100 + 1];
380
- snprintfz(msg, sizeof(msg) - 1, "disconnected (completed %zu updates)", count);
380
+ snprintfz(msg, sizeof(msg) - 1, "receiver disconnected (completed %zu updates)", count);
381
stream_receiver_log_status(rpt, msg, STREAM_STATUS_DISCONNECTED, NDLP_WARNING);
382
}
383
384
- // in case we have cloud connection we inform cloud
385
- // a child disconnected
384
+ // in case we are connected to netdata cloud,
385
+ // we inform cloud that a child got disconnected
386
uint64_t total_reboot = rrdhost_stream_path_total_reboot_time_ms(rpt->host);
387
schedule_node_state_update(rpt->host, MIN((total_reboot * MAX_CHILD_DISC_TOLERANCE), MAX_CHILD_DISC_DELAY));
388
@@ -451,7 +451,7 @@ void stream_receive_process_poll_events(struct stream_thread *sth, struct receiv
451
452
worker_is_busy(WORKER_STREAM_JOB_SOCKET_ERROR);
453
receiver_set_exit_reason(rpt, read_stream_error_to_reason(bytes), false);
454
- stream_receiver_remove(sth, rpt, "socket read error");
454
+ stream_receiver_remove(sth, rpt, "receiver socket read error");
455
return;
456
}
457
@@ -473,7 +473,7 @@ void stream_receive_process_poll_events(struct stream_thread *sth, struct receiv
473
while (buffered_reader_next_line(&rpt->reader, rpt->thread.buffer)) {
474
if (unlikely(parser_action(parser, rpt->thread.buffer->buffer))) {
475
receiver_set_exit_reason(rpt, STREAM_HANDSHAKE_DISCONNECT_PARSER_FAILED, false);
476
- stream_receiver_remove(sth, rpt, "parser failed");
476
+ stream_receiver_remove(sth, rpt, "parser action failed");
477
node_removed = true;
478
break;
479
}
@@ -487,7 +487,7 @@ void stream_receive_process_poll_events(struct stream_thread *sth, struct receiv
487
488
else {
489
receiver_set_exit_reason(rpt, STREAM_HANDSHAKE_DISCONNECT_PARSER_FAILED, false);
490
- stream_receiver_remove(sth, rpt, "decompressor failed");
490
+ stream_receiver_remove(sth, rpt, "receiver decompressor failed");
491
node_removed = true;
492
break;
493
}
@@ -497,7 +497,7 @@ void stream_receive_process_poll_events(struct stream_thread *sth, struct receiv
497
break;
498
else {
499
receiver_set_exit_reason(rpt, STREAM_HANDSHAKE_DISCONNECT_PARSER_FAILED, false);
500
- stream_receiver_remove(sth, rpt, "compressed data invalid");
500
+ stream_receiver_remove(sth, rpt, "receiver compressed data invalid");
501
node_removed = true;
502
break;
503
}
@@ -526,7 +526,7 @@ void stream_receive_process_poll_events(struct stream_thread *sth, struct receiv
526
while(buffered_reader_next_line(&rpt->reader, rpt->thread.buffer)) {
527
if(unlikely(parser_action(parser, rpt->thread.buffer->buffer))) {
528
receiver_set_exit_reason(rpt, STREAM_HANDSHAKE_DISCONNECT_PARSER_FAILED, false);
529
- stream_receiver_remove(sth, rpt, "parser failed");
529
+ stream_receiver_remove(sth, rpt, "parser action failed");
530
break;
531
}
532
src/streaming/stream-sender.c
+2
-2
@@ -352,7 +352,7 @@ static void stream_sender_move_running_to_connector_or_remove(struct stream_thre
352
stream_sender_unlock(s);
353
354
nd_log(NDLS_DAEMON, NDLP_NOTICE,
355
- "STREAM SEND [%s]: disconnected from parent, reason: %s",
355
+ "STREAM SEND [%s]: sender disconnected from parent, reason: %s",
356
rrdhost_hostname(s->host), stream_handshake_error_to_string(reason));
357
358
nd_sock_close(&s->sock);
@@ -410,7 +410,7 @@ void stream_sender_check_all_nodes_from_poll(struct stream_thread *sth) {
410
sth->id, rrdhost_hostname(s->host), s->connected_to, stream_send.parents.timeout_s,
411
s->thread.bytes_sent, s->thread.sends);
412
413
- stream_sender_move_running_to_connector_or_remove(sth, s, STREAM_HANDSHAKE_DISCONNECT_SOCKET_READ_TIMEOUT, true);
413
+ stream_sender_move_running_to_connector_or_remove(sth, s, STREAM_HANDSHAKE_DISCONNECT_SOCKET_TIMEOUT, true);
414
continue;
415
}
416