summaryrefslogtreecommitdiffstats
path: root/collectors/plugins.d
diff options
context:
space:
mode:
authorCarlo Cabrera <30379873+carlocab@users.noreply.github.com>2023-07-01 05:14:26 +0800
committerGitHub <noreply@github.com>2023-06-30 21:14:26 +0000
commit5b56f09dbcfa159605268e731c02734486530507 (patch)
tree885958d2c176c0c328e5ac8749073a071a4380b2 /collectors/plugins.d
parentb51c4278dd251c45daba5d2f457755da936651e3 (diff)
Replace `info` macro with a less generic name (#15266)
Diffstat (limited to 'collectors/plugins.d')
-rw-r--r--collectors/plugins.d/plugins_d.c18
-rw-r--r--collectors/plugins.d/pluginsd_parser.c6
2 files changed, 12 insertions, 12 deletions
diff --git a/collectors/plugins.d/plugins_d.c b/collectors/plugins.d/plugins_d.c
index f3e9ff6315..60d81cdd17 100644
--- a/collectors/plugins.d/plugins_d.c
+++ b/collectors/plugins.d/plugins_d.c
@@ -65,11 +65,11 @@ static void pluginsd_worker_thread_cleanup(void *arg)
if (pid) {
siginfo_t info;
- info("PLUGINSD: 'host:%s', killing data collection child process with pid %d",
+ netdata_log_info("PLUGINSD: 'host:%s', killing data collection child process with pid %d",
rrdhost_hostname(cd->host), pid);
if (killpid(pid) != -1) {
- info("PLUGINSD: 'host:%s', waiting for data collection child process pid %d to exit...",
+ netdata_log_info("PLUGINSD: 'host:%s', waiting for data collection child process pid %d to exit...",
rrdhost_hostname(cd->host), pid);
netdata_waitid(P_PID, (id_t)pid, &info, WEXITED);
@@ -85,7 +85,7 @@ static void pluginsd_worker_thread_handle_success(struct plugind *cd) {
}
if (likely(cd->serial_failures <= SERIAL_FAILURES_THRESHOLD)) {
- info("PLUGINSD: 'host:%s', '%s' (pid %d) does not generate useful output but it reports success (exits with 0). %s.",
+ netdata_log_info("PLUGINSD: 'host:%s', '%s' (pid %d) does not generate useful output but it reports success (exits with 0). %s.",
rrdhost_hostname(cd->host), cd->fullfilename, cd->unsafe.pid,
plugin_is_enabled(cd) ? "Waiting a bit before starting it again." : "Will not start it again - it is now disabled.");
@@ -105,7 +105,7 @@ static void pluginsd_worker_thread_handle_success(struct plugind *cd) {
static void pluginsd_worker_thread_handle_error(struct plugind *cd, int worker_ret_code) {
if (worker_ret_code == -1) {
- info("PLUGINSD: 'host:%s', '%s' (pid %d) was killed with SIGTERM. Disabling it.",
+ netdata_log_info("PLUGINSD: 'host:%s', '%s' (pid %d) was killed with SIGTERM. Disabling it.",
rrdhost_hostname(cd->host), cd->fullfilename, cd->unsafe.pid);
plugin_set_disabled(cd);
return;
@@ -157,12 +157,12 @@ static void *pluginsd_worker_thread(void *arg) {
break;
}
- info("PLUGINSD: 'host:%s' connected to '%s' running on pid %d",
+ netdata_log_info("PLUGINSD: 'host:%s' connected to '%s' running on pid %d",
rrdhost_hostname(cd->host), cd->fullfilename, cd->unsafe.pid);
count = pluginsd_process(cd->host, cd, fp_child_input, fp_child_output, 0);
- info("PLUGINSD: 'host:%s', '%s' (pid %d) disconnected after %zu successful data collections (ENDs).",
+ netdata_log_info("PLUGINSD: 'host:%s', '%s' (pid %d) disconnected after %zu successful data collections (ENDs).",
rrdhost_hostname(cd->host), cd->fullfilename, cd->unsafe.pid, count);
killpid(cd->unsafe.pid);
@@ -186,13 +186,13 @@ static void *pluginsd_worker_thread(void *arg) {
static void pluginsd_main_cleanup(void *data) {
struct netdata_static_thread *static_thread = (struct netdata_static_thread *)data;
static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
- info("PLUGINSD: cleaning up...");
+ netdata_log_info("PLUGINSD: cleaning up...");
struct plugind *cd;
for (cd = pluginsd_root; cd; cd = cd->next) {
spinlock_lock(&cd->unsafe.spinlock);
if (cd->unsafe.enabled && cd->unsafe.running && cd->unsafe.thread != 0) {
- info("PLUGINSD: 'host:%s', stopping plugin thread: %s",
+ netdata_log_info("PLUGINSD: 'host:%s', stopping plugin thread: %s",
rrdhost_hostname(cd->host), cd->id);
netdata_thread_cancel(cd->unsafe.thread);
@@ -200,7 +200,7 @@ static void pluginsd_main_cleanup(void *data) {
spinlock_unlock(&cd->unsafe.spinlock);
}
- info("PLUGINSD: cleanup completed.");
+ netdata_log_info("PLUGINSD: cleanup completed.");
static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
worker_unregister();
diff --git a/collectors/plugins.d/pluginsd_parser.c b/collectors/plugins.d/pluginsd_parser.c
index 39c5f00700..985640f341 100644
--- a/collectors/plugins.d/pluginsd_parser.c
+++ b/collectors/plugins.d/pluginsd_parser.c
@@ -1017,7 +1017,7 @@ static inline PARSER_RC pluginsd_flush(char **words __maybe_unused, size_t num_w
}
static inline PARSER_RC pluginsd_disable(char **words __maybe_unused, size_t num_words __maybe_unused, PARSER *parser) {
- info("PLUGINSD: plugin called DISABLE. Disabling it.");
+ netdata_log_info("PLUGINSD: plugin called DISABLE. Disabling it.");
parser->user.enabled = 0;
return PARSER_RC_STOP;
}
@@ -1796,7 +1796,7 @@ static inline PARSER_RC pluginsd_end_v2(char **words __maybe_unused, size_t num_
}
static inline PARSER_RC pluginsd_exit(char **words __maybe_unused, size_t num_words __maybe_unused, PARSER *parser __maybe_unused) {
- info("PLUGINSD: plugin called EXIT.");
+ netdata_log_info("PLUGINSD: plugin called EXIT.");
return PARSER_RC_STOP;
}
@@ -2173,7 +2173,7 @@ int pluginsd_parser_unittest(void) {
}
usec_t ended = now_realtime_usec();
- info("Parsed %zu lines in %0.2f secs, %0.2f klines/sec", count,
+ netdata_log_info("Parsed %zu lines in %0.2f secs, %0.2f klines/sec", count,
(double)(ended - started) / (double)USEC_PER_SEC,
(double)count / ((double)(ended - started) / (double)USEC_PER_SEC) / 1000.0);