diff options
| author | Emmanuel Vasilakis <mrzammler@mm.st> | 2021-09-28 17:52:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 17:52:47 +0300 |
| commit | ffc4c5dee09b4a8306e9e906819fc4981e5b00f6 (patch) | |
| tree | 8b2386561d1d121fadf3c602fc86bd0efc98125a /daemon | |
| parent | d3c5ffab0d70145db06de4f46de8172c7461e82a (diff) | |
Free analytics data when analytics thread stops (#11575)
* move analytics_free_data to when analytics thread stops
* only log hits if analytics is enabled
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/analytics.c | 9 | ||||
| -rw-r--r-- | daemon/main.c | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/daemon/analytics.c b/daemon/analytics.c index 642fee5e8f..b8f3410cfe 100644 --- a/daemon/analytics.c +++ b/daemon/analytics.c @@ -150,7 +150,7 @@ void analytics_get_data(char *name, BUFFER *wb) */ void analytics_log_prometheus(void) { - if (likely(analytics_data.prometheus_hits < ANALYTICS_MAX_PROMETHEUS_HITS)) { + if (netdata_anonymous_statistics_enabled == 1 && likely(analytics_data.prometheus_hits < ANALYTICS_MAX_PROMETHEUS_HITS)) { analytics_data.prometheus_hits++; char b[7]; snprintfz(b, 6, "%d", analytics_data.prometheus_hits); @@ -163,7 +163,7 @@ void analytics_log_prometheus(void) */ void analytics_log_shell(void) { - if (likely(analytics_data.shell_hits < ANALYTICS_MAX_SHELL_HITS)) { + if (netdata_anonymous_statistics_enabled == 1 && likely(analytics_data.shell_hits < ANALYTICS_MAX_SHELL_HITS)) { analytics_data.shell_hits++; char b[7]; snprintfz(b, 6, "%d", analytics_data.shell_hits); @@ -176,7 +176,7 @@ void analytics_log_shell(void) */ void analytics_log_json(void) { - if (likely(analytics_data.json_hits < ANALYTICS_MAX_JSON_HITS)) { + if (netdata_anonymous_statistics_enabled == 1 && likely(analytics_data.json_hits < ANALYTICS_MAX_JSON_HITS)) { analytics_data.json_hits++; char b[7]; snprintfz(b, 6, "%d", analytics_data.json_hits); @@ -189,7 +189,7 @@ void analytics_log_json(void) */ void analytics_log_dashboard(void) { - if (likely(analytics_data.dashboard_hits < ANALYTICS_MAX_DASHBOARD_HITS)) { + if (netdata_anonymous_statistics_enabled == 1 && likely(analytics_data.dashboard_hits < ANALYTICS_MAX_DASHBOARD_HITS)) { analytics_data.dashboard_hits++; char b[7]; snprintfz(b, 6, "%d", analytics_data.dashboard_hits); @@ -589,6 +589,7 @@ void analytics_main_cleanup(void *ptr) static_thread->enabled = NETDATA_MAIN_THREAD_EXITING; debug(D_ANALYTICS, "Cleaning up..."); + analytics_free_data(); static_thread->enabled = NETDATA_MAIN_THREAD_EXITED; } diff --git a/daemon/main.c b/daemon/main.c index d4cafcf0db..4bd434637e 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -28,7 +28,6 @@ void netdata_cleanup_and_exit(int ret) { info("EXIT: netdata prepares to exit with code %d...", ret); send_statistics("EXIT", ret?"ERROR":"OK","-"); - analytics_free_data(); char agent_crash_file[FILENAME_MAX + 1]; char agent_incomplete_shutdown_file[FILENAME_MAX + 1]; |