diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-31 12:59:21 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-31 12:59:21 +0000 |
| commit | bb8713bbc1c4594366fc735c04910edbf4c61aab (patch) | |
| tree | d7da56c0b89aa371dd8ad986995dd145fdf6670a /streaming/receiver.c | |
| parent | Releasing debian version 1.29.3-4. (diff) | |
| download | netdata-bb8713bbc1c4594366fc735c04910edbf4c61aab.tar.xz netdata-bb8713bbc1c4594366fc735c04910edbf4c61aab.zip | |
Merging upstream version 1.30.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'streaming/receiver.c')
| -rw-r--r-- | streaming/receiver.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/streaming/receiver.c b/streaming/receiver.c index 3ea15806d..03954064a 100644 --- a/streaming/receiver.c +++ b/streaming/receiver.c @@ -261,6 +261,14 @@ static int rrdpush_receive(struct receiver_state *rpt) mode = rrd_memory_mode_id(appconfig_get(&stream_config, rpt->key, "default memory mode", rrd_memory_mode_name(mode))); mode = rrd_memory_mode_id(appconfig_get(&stream_config, rpt->machine_guid, "memory mode", rrd_memory_mode_name(mode))); +#ifndef ENABLE_DBENGINE + if (unlikely(mode == RRD_MEMORY_MODE_DBENGINE)) { + close(rpt->fd); + log_stream_connection(rpt->client_ip, rpt->client_port, rpt->key, rpt->machine_guid, rpt->hostname, "REJECTED -- DBENGINE MEMORY MODE NOT SUPPORTED"); + return 1; + } +#endif + health_enabled = appconfig_get_boolean_ondemand(&stream_config, rpt->key, "health enabled by default", health_enabled); health_enabled = appconfig_get_boolean_ondemand(&stream_config, rpt->machine_guid, "health enabled", health_enabled); @@ -440,7 +448,7 @@ static int rrdpush_receive(struct receiver_state *rpt) cd.version = rpt->stream_version; -#ifdef ENABLE_ACLK +#if defined(ENABLE_ACLK) && !defined(ACLK_NG) // in case we have cloud connection we inform cloud // new slave connected if (netdata_cloud_setting) @@ -454,7 +462,7 @@ static int rrdpush_receive(struct receiver_state *rpt) error("STREAM %s [receive from [%s]:%s]: disconnected (completed %zu updates).", rpt->hostname, rpt->client_ip, rpt->client_port, count); -#ifdef ENABLE_ACLK +#if defined(ENABLE_ACLK) && !defined(ACLK_NG) // in case we have cloud connection we inform cloud // new slave connected if (netdata_cloud_setting) |