![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2d39d66)
raw | patch | inline | side by side (parent: 2d39d66)
| author | Sebastian Harl <sh@tokkee.org> | |
| Tue, 15 Nov 2016 21:10:35 +0000 (22:10 +0100) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Tue, 15 Nov 2016 21:10:35 +0000 (22:10 +0100) |
13 files changed:
diff --git a/src/core/data.c b/src/core/data.c
index 6fcd2eb4b47a05d202ca8aa8aaada16b40c763ce..d176b891e8e7dd71476dbaebe6c6cb82b5952884 100644 (file)
--- a/src/core/data.c
+++ b/src/core/data.c
return -1;
if (regcomp(&tmp.data.re.regex, tmp.data.re.raw,
REG_EXTENDED | REG_ICASE | REG_NOSUB)) {
- sdb_log(SDB_LOG_ERR, "core: Failed to compile regular "
+ sdb_log(SDB_LOG_ERR, "Failed to compile regular "
"expression '%s'", tmp.data.re.raw);
free(tmp.data.re.raw);
return -1;
|| (type == SDB_TYPE_DATETIME)) {
if (errno || (str == endptr)) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "core: Failed to parse string "
+ sdb_log(SDB_LOG_ERR, "Failed to parse string "
"'%s' as numeric value (type %i): %s", str, type,
sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
else if (endptr && (*endptr != '\0'))
- sdb_log(SDB_LOG_WARNING, "core: Ignoring garbage after "
+ sdb_log(SDB_LOG_WARNING, "Ignoring garbage after "
"number while parsing numeric value (type %i): %s.",
type, endptr);
}
diff --git a/src/core/plugin.c b/src/core/plugin.c
index 76fc2092d022ff8588a2b5f11739e8653fa5c1c4..b3f00bd655504075b97c5f158b8c45a8c0d20d05 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
assert(cb->cb_ctx);
- sdb_log(SDB_LOG_INFO, "core: Unregistering "
- "%s callback '%s' (module %s)", type, cb->super.name,
- cb->cb_ctx->info.plugin_name);
+ sdb_log(SDB_LOG_INFO, "Unregistering %s callback '%s' (module %s)",
+ type, cb->super.name, cb->cb_ctx->info.plugin_name);
sdb_object_deref(SDB_OBJ(cb));
}
}
if (ctx->handle) {
const char *err;
- sdb_log(SDB_LOG_INFO, "core: Unloading module %s",
- ctx->info.plugin_name);
+ sdb_log(SDB_LOG_INFO, "Unloading module %s", ctx->info.plugin_name);
lt_dlerror();
lt_dlclose(ctx->handle);
if ((err = lt_dlerror()))
- sdb_log(SDB_LOG_WARNING, "core: Failed to unload module %s: %s",
+ sdb_log(SDB_LOG_WARNING, "Failed to unload module %s: %s",
ctx->info.plugin_name, err);
}
assert(list); assert(type);
if (sdb_llist_search_by_name(*list, obj->name)) {
- sdb_log(SDB_LOG_WARNING, "core: %s callback '%s' "
- "has already been registered. Ignoring newly "
- "registered version.", type, obj->name);
+ sdb_log(SDB_LOG_WARNING, "%s callback '%s' has already been "
+ "registered. Ignoring newly registered version.",
+ type, obj->name);
return 0;
}
return 1;
if ((! impl->store_host) || (! impl->store_service)
|| (! impl->store_metric) || (! impl->store_attribute)) {
- sdb_log(SDB_LOG_ERR, "core: store writer callback '%s' "
- "does not fully implement the writer interface.",
- obj->name);
+ sdb_log(SDB_LOG_ERR, "store writer callback '%s' does not fully "
+ "implement the writer interface.", obj->name);
return -1;
}
assert(impl);
if ((! impl->prepare_query) || (! impl->execute_query)) {
- sdb_log(SDB_LOG_ERR, "core: store reader callback '%s' "
- "does not fully implement the reader interface.",
- obj->name);
+ sdb_log(SDB_LOG_ERR, "store reader callback '%s' does not fully "
+ "implement the reader interface.", obj->name);
return -1;
}
assert(impl);
if ((! impl->describe) || (! impl->fetch)) {
- sdb_log(SDB_LOG_ERR, "core: timeseries fetcher callback '%s' "
- "does not fully implement the interface.",
- obj->name);
+ sdb_log(SDB_LOG_ERR, "timeseries fetcher callback '%s' does not fully "
+ "implement the interface.", obj->name);
return -1;
}
mod_init = (int (*)(sdb_plugin_info_t *))lt_dlsym(lh, "sdb_module_init");
if (! mod_init) {
- sdb_log(SDB_LOG_ERR, "core: Failed to load plugin '%s': "
+ sdb_log(SDB_LOG_ERR, "Failed to load plugin '%s': "
"could not find symbol 'sdb_module_init'", name);
return -1;
}
status = mod_init(info);
if (status) {
- sdb_log(SDB_LOG_ERR, "core: Failed to initialize "
- "module '%s'", name);
+ sdb_log(SDB_LOG_ERR, "Failed to initialize module '%s'", name);
plugin_unregister_by_name(name);
return -1;
}
if (access(filename, R_OK)) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "core: Failed to load plugin '%s' (%s): %s",
+ sdb_log(SDB_LOG_ERR, "Failed to load plugin '%s' (%s): %s",
name, filename, sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
lh = lt_dlopen(filename);
if (! lh) {
- sdb_log(SDB_LOG_ERR, "core: Failed to load plugin '%s': %s"
+ sdb_log(SDB_LOG_ERR, "Failed to load plugin '%s': %s"
"The most common cause for this problem are missing "
"dependencies.\n", name, lt_dlerror());
return -1;
}
if (ctx_get())
- sdb_log(SDB_LOG_WARNING, "core: Discarding old plugin context");
+ sdb_log(SDB_LOG_WARNING, "Discarding old plugin context");
ctx = ctx_create(name);
if (! ctx) {
- sdb_log(SDB_LOG_ERR, "core: Failed to initialize plugin context");
+ sdb_log(SDB_LOG_ERR, "Failed to initialize plugin context");
return -1;
}
/* compare minor version */
if ((ctx->info.version < 0)
|| ((int)(ctx->info.version / 100) != (int)(SDB_VERSION / 100)))
- sdb_log(SDB_LOG_WARNING, "core: WARNING: version of "
- "plugin '%s' (%i.%i.%i) does not match our version "
- "(%i.%i.%i); this might cause problems",
- name, SDB_VERSION_DECODE(ctx->info.version),
+ sdb_log(SDB_LOG_WARNING, "WARNING: plugin version (%i.%i.%i) "
+ "does not match core version (%i.%i.%i); "
+ "this might cause problems",
+ SDB_VERSION_DECODE(ctx->info.version),
SDB_VERSION_DECODE(SDB_VERSION));
sdb_llist_append(all_plugins, SDB_OBJ(ctx));
- sdb_log(SDB_LOG_INFO, "core: Successfully loaded "
- "plugin %s v%i (%s)", ctx->info.plugin_name,
- ctx->info.plugin_version,
+ /* log messages will be prefixed by the plugin name */
+ sdb_log(SDB_LOG_INFO, "Successfully loaded "
+ "version %i (%s)", ctx->info.plugin_version,
INFO_GET(&ctx->info, description));
- sdb_log(SDB_LOG_INFO, "core: Plugin %s: %s, License: %s",
- ctx->info.plugin_name,
+ sdb_log(SDB_LOG_INFO, "%s, License: %s",
INFO_GET(&ctx->info, copyright),
INFO_GET(&ctx->info, license));
/* pass control to the list */
sdb_object_deref(obj);
- sdb_log(SDB_LOG_INFO, "core: Registered %s callback '%s'.",
- type, name);
+ sdb_log(SDB_LOG_INFO, "Registered %s callback '%s'.", type, name);
return 0;
} /* plugin_add_impl */
if (lu.last_update >= last_update) {
if (lu.last_update > last_update)
- sdb_log(SDB_LOG_DEBUG, "memstore: Cannot update %s '%s' - "
+ sdb_log(SDB_LOG_DEBUG, "Cannot update %s '%s' - "
"value too old (%"PRIsdbTIME" < %"PRIsdbTIME")",
SDB_STORE_TYPE_TO_NAME(obj_type), name,
lu.last_update, last_update);
if (! all_plugins) {
if (! (all_plugins = sdb_llist_create())) {
- sdb_log(SDB_LOG_ERR, "core: Failed to load plugin '%s': "
+ sdb_log(SDB_LOG_ERR, "Failed to load plugin '%s': "
"internal error while creating linked list", name);
return -1;
}
if (status)
return status;
- sdb_log(SDB_LOG_INFO, "core: Successfully reloaded plugin "
+ ctx_set(old_ctx);
+ sdb_log(SDB_LOG_INFO, "Successfully reloaded plugin "
"'%s' (%s)", ctx->info.plugin_name,
INFO_GET(&ctx->info, description));
}
ctx_t *ctx = ctx_get();
if (! ctx) {
- sdb_log(SDB_LOG_ERR, "core: Invalid attempt to register a "
+ sdb_log(SDB_LOG_ERR, "Invalid attempt to register a "
"config callback from outside a plugin");
return -1;
}
@@ -1110,9 +1103,8 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
ctx_t *ctx = ctx_get();
if (! ctx) {
- sdb_log(SDB_LOG_ERR, "core: Cannot determine interval "
- "for collector %s; none specified and no plugin "
- "context found", cb_name);
+ sdb_log(SDB_LOG_ERR, "Cannot determine interval for collector %s; "
+ "none specified and no plugin context found", cb_name);
return -1;
}
@@ -1121,8 +1113,8 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
if (! (CCB(obj)->ccb_next_update = sdb_gettime())) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "core: Failed to determine current "
- "time: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ sdb_log(SDB_LOG_ERR, "Failed to determine current time: %s",
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
sdb_object_deref(obj);
return -1;
}
@@ -1136,7 +1128,7 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
/* pass control to the list */
sdb_object_deref(obj);
- sdb_log(SDB_LOG_INFO, "core: Registered collector callback '%s' "
+ sdb_log(SDB_LOG_INFO, "Registered collector callback '%s' "
"(interval = %.3fs).", cb_name,
SDB_TIME_TO_DOUBLE(CCB(obj)->ccb_interval));
return 0;
continue;
sdb_llist_clear(list);
- sdb_log(SDB_LOG_INFO, "core: Unregistered %zu %s callback%s",
+ sdb_log(SDB_LOG_INFO, "Unregistered %zu %s callback%s",
len, type, len == 1 ? "" : "s");
}
} /* sdb_plugin_unregister_all */
c = ctx_get();
if (! c) {
- sdb_log(SDB_LOG_ERR, "core: Invalid read access to plugin "
+ sdb_log(SDB_LOG_ERR, "Invalid read access to plugin "
"context outside a plugin");
return plugin_default_ctx;
}
c = ctx_get();
if (! c) {
- sdb_log(SDB_LOG_ERR, "core: Invalid write access to plugin "
+ sdb_log(SDB_LOG_ERR, "Invalid write access to plugin "
"context outside a plugin");
return -1;
}
if (! plugin) {
ctx_t *ctx = CTX(sdb_llist_search_by_name(all_plugins, name));
if (! ctx)
- sdb_log(SDB_LOG_ERR, "core: Cannot configure unknown "
- "plugin '%s'. Missing 'LoadPlugin \"%s\"'?",
+ sdb_log(SDB_LOG_ERR, "Cannot configure unknown plugin '%s'. "
+ "Missing 'LoadPlugin \"%s\"'?",
name, name);
else
- sdb_log(SDB_LOG_ERR, "core: Plugin '%s' did not register "
+ sdb_log(SDB_LOG_ERR, "Plugin '%s' did not register "
"a config callback.", name);
errno = ENOENT;
return -1;
if (ctx->use_cnt)
continue;
- sdb_log(SDB_LOG_INFO, "core: Module %s no longer in use",
+ sdb_log(SDB_LOG_INFO, "Module %s no longer in use",
ctx->info.plugin_name);
sdb_llist_iter_remove_current(iter);
plugin_unregister_by_name(ctx->info.plugin_name);
old_ctx = ctx_set(cb->cb_ctx);
if (callback(cb->cb_user_data)) {
- sdb_log(SDB_LOG_ERR, "core: Failed to initialize plugin "
- "'%s'. Unregistering all callbacks.", obj->name);
+ sdb_log(SDB_LOG_ERR, "Failed to initialize plugin '%s'. "
+ "Unregistering all callbacks.", obj->name);
ctx_set(old_ctx);
plugin_unregister_by_name(cb->cb_ctx->info.plugin_name);
++ret;
old_ctx = ctx_set(cb->cb_ctx);
if (callback(cb->cb_user_data)) {
- sdb_log(SDB_LOG_ERR, "core: Failed to shutdown plugin '%s'.",
+ sdb_log(SDB_LOG_ERR, "Failed to shutdown plugin '%s'.",
obj->name);
++ret;
}
sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
{
if (! collector_list) {
- sdb_log(SDB_LOG_WARNING, "core: No collectors registered. "
+ sdb_log(SDB_LOG_WARNING, "No collectors registered. "
"Quiting main loop.");
return -1;
}
if (! (now = sdb_gettime())) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "core: Failed to determine current "
+ sdb_log(SDB_LOG_ERR, "Failed to determine current "
"time in collector main loop: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
now = CCB(obj)->ccb_next_update;
while (loop->do_loop && sdb_sleep(interval, &interval)) {
if (errno != EINTR) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "core: Failed to sleep "
+ sdb_log(SDB_LOG_ERR, "Failed to sleep "
"in collector main loop: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
sdb_llist_insert_sorted(collector_list, obj,
if (! interval)
interval = loop->default_interval;
if (! interval) {
- sdb_log(SDB_LOG_WARNING, "core: No interval configured "
+ sdb_log(SDB_LOG_WARNING, "No interval configured "
"for plugin '%s'; skipping any further "
"iterations.", obj->name);
sdb_object_deref(obj);
if (! (now = sdb_gettime())) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "core: Failed to determine current "
+ sdb_log(SDB_LOG_ERR, "Failed to determine current "
"time in collector main loop: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
now = CCB(obj)->ccb_next_update;
}
if (now > CCB(obj)->ccb_next_update) {
- sdb_log(SDB_LOG_WARNING, "core: Plugin '%s' took too "
+ sdb_log(SDB_LOG_WARNING, "Plugin '%s' took too "
"long; skipping iterations to keep up.",
obj->name);
CCB(obj)->ccb_next_update = now;
if (sdb_llist_insert_sorted(collector_list, obj,
plugin_cmp_next_update)) {
- sdb_log(SDB_LOG_ERR, "core: Failed to re-insert "
- "plugin '%s' into collector list. Unable to further "
- "use the plugin.",
+ sdb_log(SDB_LOG_ERR, "Failed to re-insert plugin '%s' into "
+ "collector list. Unable to further use the plugin.",
obj->name);
sdb_object_deref(obj);
return -1;
int
sdb_plugin_log(int prio, const char *msg)
{
- sdb_llist_iter_t *iter;
+ const sdb_plugin_info_t *info;
int ret = -1;
- bool logged = 0;
-
if (! msg)
return 0;
- iter = sdb_llist_get_iter(log_list);
- while (sdb_llist_iter_has_next(iter)) {
- sdb_plugin_log_cb callback;
- int tmp;
+ info = sdb_plugin_current();
- sdb_object_t *obj = sdb_llist_iter_get_next(iter);
- assert(obj);
+ {
+ const char *plugin_name = info ? info->plugin_name : "";
+ char log_msg[strlen(msg) + strlen(plugin_name) + strlen(" plugin: ") + 1];
- callback = (sdb_plugin_log_cb)CB(obj)->cb_callback;
- tmp = callback(prio, msg, CB(obj)->cb_user_data);
- if (tmp > ret)
- ret = tmp;
+ sdb_llist_iter_t *iter;
+ bool logged = 0;
- if (CB(obj)->cb_ctx)
- logged = 1;
- /* else: this is an internally registered callback */
- }
- sdb_llist_iter_destroy(iter);
+ if (*plugin_name)
+ snprintf(log_msg, sizeof(log_msg), "%s plugin: %s",
+ plugin_name, msg);
+ else
+ strncpy(log_msg, msg, sizeof(log_msg));
+
+ iter = sdb_llist_get_iter(log_list);
+ while (sdb_llist_iter_has_next(iter)) {
+ sdb_plugin_log_cb callback;
+ int tmp;
+
+ sdb_object_t *obj = sdb_llist_iter_get_next(iter);
+ assert(obj);
+
+ callback = (sdb_plugin_log_cb)CB(obj)->cb_callback;
+ tmp = callback(prio, msg, CB(obj)->cb_user_data);
+ if (tmp > ret)
+ ret = tmp;
+
+ if (CB(obj)->cb_ctx)
+ logged = 1;
+ /* else: this is an internally registered callback */
+ }
+ sdb_llist_iter_destroy(iter);
- if (! logged)
- return fprintf(stderr, "[%s] %s\n", SDB_LOG_PRIO_TO_STRING(prio), msg);
+ if (! logged)
+ return fprintf(stderr, "[%s] %s\n",
+ SDB_LOG_PRIO_TO_STRING(prio), log_msg);
+ }
return ret;
} /* sdb_plugin_log */
fetcher = TS_FETCHER(sdb_llist_search_by_name(timeseries_fetcher_list, type));
if (! fetcher) {
- sdb_log(SDB_LOG_ERR, "core: Cannot fetch time-series of type %s: "
+ sdb_log(SDB_LOG_ERR, "Cannot fetch time-series of type %s: "
"no such plugin loaded", type);
errno = ENOENT;
return NULL;
fetcher = TS_FETCHER(sdb_llist_search_by_name(timeseries_fetcher_list, type));
if (! fetcher) {
- sdb_log(SDB_LOG_ERR, "core: Cannot describe time-series of type %s: "
+ sdb_log(SDB_LOG_ERR, "Cannot describe time-series of type %s: "
"no such plugin loaded", type);
errno = ENOENT;
return NULL;
if ((ast->type != SDB_AST_TYPE_FETCH)
&& (ast->type != SDB_AST_TYPE_LIST)
&& (ast->type != SDB_AST_TYPE_LOOKUP)) {
- sdb_log(SDB_LOG_ERR, "core: Cannot execute query of type %s",
+ sdb_log(SDB_LOG_ERR, "Cannot execute query of type %s",
SDB_AST_TYPE_TO_STRING(ast));
sdb_strbuf_sprintf(errbuf, "Cannot execute query of type %s",
SDB_AST_TYPE_TO_STRING(ast));
? "Cannot execute query: multiple readers not supported"
: "Cannot execute query: no readers registered";
sdb_strbuf_sprintf(errbuf, "%s", msg);
- sdb_log(SDB_LOG_ERR, "core: %s", msg);
+ sdb_log(SDB_LOG_ERR, "%s", msg);
return -1;
}
return -1;
if (! sdb_llist_len(writer_list)) {
- sdb_log(SDB_LOG_ERR, "core: Cannot store host: "
- "no writers registered");
+ sdb_log(SDB_LOG_ERR, "Cannot store host: no writers registered");
return -1;
}
cname = sdb_plugin_cname(strdup(name));
if (! cname) {
- sdb_log(SDB_LOG_ERR, "core: strdup failed");
+ sdb_log(SDB_LOG_ERR, "strdup failed");
return -1;
}
return -1;
if (! sdb_llist_len(writer_list)) {
- sdb_log(SDB_LOG_ERR, "core: Cannot store service: "
+ sdb_log(SDB_LOG_ERR, "Cannot store service: "
"no writers registered");
return -1;
}
cname = sdb_plugin_cname(strdup(hostname));
if (! cname) {
- sdb_log(SDB_LOG_ERR, "core: strdup failed");
+ sdb_log(SDB_LOG_ERR, "strdup failed");
return -1;
}
return -1;
if (! sdb_llist_len(writer_list)) {
- sdb_log(SDB_LOG_ERR, "core: Cannot store metric: "
- "no writers registered");
+ sdb_log(SDB_LOG_ERR, "Cannot store metric: no writers registered");
return -1;
}
cname = sdb_plugin_cname(strdup(hostname));
if (! cname) {
- sdb_log(SDB_LOG_ERR, "core: strdup failed");
+ sdb_log(SDB_LOG_ERR, "strdup failed");
return -1;
}
return -1;
if (! sdb_llist_len(writer_list)) {
- sdb_log(SDB_LOG_ERR, "core: Cannot store attribute: "
- "no writers registered");
+ sdb_log(SDB_LOG_ERR, "Cannot store attribute: no writers registered");
return -1;
}
cname = sdb_plugin_cname(strdup(hostname));
if (! cname) {
- sdb_log(SDB_LOG_ERR, "core: strdup failed");
+ sdb_log(SDB_LOG_ERR, "strdup failed");
return -1;
}
@@ -1960,14 +1963,14 @@ sdb_plugin_store_service_attribute(const char *hostname, const char *service,
return -1;
if (! sdb_llist_len(writer_list)) {
- sdb_log(SDB_LOG_ERR, "core: Cannot store service attribute: "
+ sdb_log(SDB_LOG_ERR, "Cannot store service attribute: "
"no writers registered");
return -1;
}
cname = sdb_plugin_cname(strdup(hostname));
if (! cname) {
- sdb_log(SDB_LOG_ERR, "core: strdup failed");
+ sdb_log(SDB_LOG_ERR, "strdup failed");
return -1;
}
return -1;
if (! sdb_llist_len(writer_list)) {
- sdb_log(SDB_LOG_ERR, "core: Cannot store metric attribute: "
+ sdb_log(SDB_LOG_ERR, "Cannot store metric attribute: "
"no writers registered");
return -1;
}
cname = sdb_plugin_cname(strdup(hostname));
if (! cname) {
- sdb_log(SDB_LOG_ERR, "core: strdup failed");
+ sdb_log(SDB_LOG_ERR, "strdup failed");
return -1;
}
index 73d0dc6228e8aff05c5c7b41195412a1cfc63ffa..d5d732197bc519de94fe0eafc585a964233bfdf4 100644 (file)
/* else: first/new host */
if (state->current_host) {
- sdb_log(SDB_LOG_DEBUG, "collectd::unixsock backend: Added/updated "
- "%i metric%s (%i failed) for host '%s'.",
+ sdb_log(SDB_LOG_DEBUG, "Added/updated %i metric%s (%i failed) for host '%s'.",
state->metrics_updated, state->metrics_updated == 1 ? "" : "s",
state->metrics_failed, state->current_host);
state->metrics_updated = state->metrics_failed = 0;
state->current_host = strdup(hostname);
if (! state->current_host) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to allocate "
- "string buffer: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to allocate string buffer: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
status = sdb_plugin_store_host(hostname, last_update);
if (status < 0) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to "
- "store/update host '%s'.", hostname);
+ sdb_log(SDB_LOG_ERR, "Failed to store/update host '%s'.", hostname);
return -1;
}
else if (status > 0) /* value too old */
return 0;
- sdb_log(SDB_LOG_DEBUG, "collectd::unixsock backend: Added/updated "
- "host '%s' (last update timestamp = %"PRIsdbTIME").",
+ sdb_log(SDB_LOG_DEBUG, "Added/updated host '%s' "
+ "(last update timestamp = %"PRIsdbTIME").",
hostname, last_update);
return 0;
} /* store_host */
else
status = sdb_plugin_store_metric(hostname, name, NULL, last_update);
if (status < 0) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to "
- "store/update metric '%s/%s'.", hostname, name);
+ sdb_log(SDB_LOG_ERR, "Failed to store/update metric '%s/%s'.", hostname, name);
return -1;
}
hostname = strchr(hostname, ' ');
if (! hostname) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Expected to find "
- "a space character in the LISTVAL response");
+ sdb_log(SDB_LOG_ERR, "Expected to find a space character "
+ "in the LISTVAL response");
return -1;
}
*hostname = '\0';
if (sdb_data_parse(data[0].data.string, SDB_TYPE_DATETIME, &last_update)) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to parse "
- "timestamp '%s' returned by LISTVAL: %s", data[0].data.string,
+ sdb_log(SDB_LOG_ERR, "Failed to parse timestamp '%s' "
+ "returned by LISTVAL: %s", data[0].data.string,
sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
ud = SDB_OBJ_WRAPPER(user_data)->data;
if (sdb_unixsock_client_connect(ud->client)) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: "
- "Failed to connect to collectd.");
+ sdb_log(SDB_LOG_ERR, "Failed to connect to collectd.");
return -1;
}
- sdb_log(SDB_LOG_INFO, "collectd::unixsock backend: Successfully "
- "connected to collectd @ %s.",
+ sdb_log(SDB_LOG_INFO, "Successfully connected to collectd @ %s.",
sdb_unixsock_client_path(ud->client));
return 0;
} /* sdb_collectd_init */
state.ud = ud;
if (sdb_unixsock_client_send(ud->client, "LISTVAL") <= 0) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to send "
- "LISTVAL command to collectd @ %s.",
+ sdb_log(SDB_LOG_ERR, "Failed to send LISTVAL command to collectd @ %s.",
sdb_unixsock_client_path(ud->client));
return -1;
}
line = sdb_unixsock_client_recv(ud->client, buffer, sizeof(buffer));
if (! line) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to read "
- "status of LISTVAL command from collectd @ %s.",
+ sdb_log(SDB_LOG_ERR, "Failed to read status of LISTVAL command from collectd @ %s.",
sdb_unixsock_client_path(ud->client));
return -1;
}
errno = 0;
count = strtol(line, &endptr, /* base */ 0);
if (errno || (line == endptr)) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to parse "
- "status of LISTVAL command from collectd @ %s.",
+ sdb_log(SDB_LOG_ERR, "Failed to parse status of LISTVAL command from collectd @ %s.",
sdb_unixsock_client_path(ud->client));
return -1;
}
if (count < 0) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to get "
- "value list from collectd @ %s: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to get value list from collectd @ %s: %s",
sdb_unixsock_client_path(ud->client),
msg ? msg : line);
return -1;
SDB_OBJ(&state_obj), count, /* delim */ "/",
/* column count = */ 3,
SDB_TYPE_STRING, SDB_TYPE_STRING, SDB_TYPE_STRING)) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed "
- "to read response from collectd @ %s.",
+ sdb_log(SDB_LOG_ERR, "Failed to read response from collectd @ %s.",
sdb_unixsock_client_path(ud->client));
return -1;
}
if (state.current_host) {
- sdb_log(SDB_LOG_DEBUG, "collectd::unixsock backend: Added/updated "
- "%i metric%s (%i failed) for host '%s'.",
+ sdb_log(SDB_LOG_DEBUG, "Added/updated %i metric%s (%i failed) for host '%s'.",
state.metrics_updated, state.metrics_updated == 1 ? "" : "s",
state.metrics_failed, state.current_host);
free(state.current_host);
int i;
if (oconfig_get_string(ci, &name)) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Instance requires "
- "a single string argument\n\tUsage: <Instance NAME>");
+ sdb_log(SDB_LOG_ERR, "Instance requires a single string argument\n"
+ "\tUsage: <Instance NAME>");
return -1;
}
ud = calloc(1, sizeof(*ud));
if (! ud) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to "
- "allocate user-data object: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to allocate user-data object: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
else if (! strcasecmp(child->key, "TimeseriesBaseURL"))
oconfig_get_string(child, &ud->ts_base);
else
- sdb_log(SDB_LOG_WARNING, "collectd::unixsock backend: Ignoring "
- "unknown config option '%s' inside <Instance %s>.",
- child->key, name);
+ sdb_log(SDB_LOG_WARNING, "Ignoring unknown config option '%s' "
+ "inside <Instance %s>.", child->key, name);
}
if ((ud->ts_type == NULL) != (ud->ts_base == NULL)) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Both options, "
- "TimeseriesBackend and TimeseriesBaseURL, have to be "
- "specified.");
+ sdb_log(SDB_LOG_ERR, "Both options, TimeseriesBackend and TimeseriesBaseURL, "
+ "have to be specified.");
ud->ts_type = ud->ts_base = NULL;
user_data_destroy(ud);
return -1;
* -> will require different ID generation */
if (strcasecmp(ud->ts_type, "rrdtool")
&& strcasecmp(ud->ts_type, "rrdcached")) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: "
- "TimeseriesBackend '%s' is not supported - "
+ sdb_log(SDB_LOG_ERR, "TimeseriesBackend '%s' is not supported - "
"use 'rrdtool' instead.", ud->ts_type);
ud->ts_type = ud->ts_base = NULL;
user_data_destroy(ud);
ud->ts_type = strdup(ud->ts_type);
ud->ts_base = strdup(ud->ts_base);
if ((! ud->ts_type) || (! ud->ts_base)) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed "
- "to duplicate a string");
+ sdb_log(SDB_LOG_ERR, "Failed to duplicate a string");
user_data_destroy(ud);
return -1;
}
}
if (! socket_path) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Instance '%s' "
- "missing the 'Socket' option.", name);
+ sdb_log(SDB_LOG_ERR, "Instance '%s' missing the 'Socket' option.", name);
user_data_destroy(ud);
return -1;
}
ud->client = sdb_unixsock_client_create(socket_path);
if (! ud->client) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to create "
- "unixsock client: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to create unixsock client: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
user_data_destroy(ud);
return -1;
user_data = sdb_object_create_wrapper("collectd-userdata", ud,
user_data_destroy);
if (! user_data) {
- sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to allocate "
- "user-data wrapper object");
+ sdb_log(SDB_LOG_ERR, "Failed to allocate user-data wrapper object");
user_data_destroy(ud);
return -1;
}
if (! strcasecmp(child->key, "Instance"))
sdb_collectd_config_instance(child);
else
- sdb_log(SDB_LOG_WARNING, "collectd::unixsock backend: Ignoring "
- "unknown config option '%s'.", child->key);
+ sdb_log(SDB_LOG_WARNING, "Ignoring unknown config option '%s'.", child->key);
}
return 0;
} /* sdb_collectd_config */
index e5561868f9d52647a8a93a298863bbf6a1454981..9b325978df43dff5b4896069eafcd5488267f68e 100644 (file)
sdb_plugin_store_host(hostname, now);
facts.each(fact_iter);
- sdb_log(SDB_LOG_DEBUG, "facter backend: Processed %zu facts "
- "for host '%s'", facts.size(), hostname);
+ sdb_log(SDB_LOG_DEBUG, "Processed %zu facts for host '%s'",
+ facts.size(), hostname);
return 0;
} /* main */
index cd8bbd0fc79d395e1d9b8fbb407020e4893dc105..4905d120cdaa6189f5f0560ef9295e70f4bf2ffd 100644 (file)
status = sdb_plugin_store_host(hostname, timestamp);
if (status < 0) {
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to "
- "store/update host '%s'.", hostname);
+ sdb_log(SDB_LOG_ERR, "Failed to store/update host '%s'.", hostname);
return -1;
}
else if (status > 0) /* value too old */
return 0;
- sdb_log(SDB_LOG_DEBUG, "MK Livestatus backend: Added/updated "
- "host '%s' (last update timestamp = %"PRIsdbTIME").",
+ sdb_log(SDB_LOG_DEBUG, "Added/updated host '%s' "
+ "(last update timestamp = %"PRIsdbTIME").",
hostname, timestamp);
return 0;
} /* sdb_livestatus_get_host */
status = sdb_plugin_store_service(hostname, svcname, timestamp);
if (status < 0) {
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to "
- "store/update service '%s / %s'.", hostname, svcname);
+ sdb_log(SDB_LOG_ERR, "Failed to store/update service '%s / %s'.",
+ hostname, svcname);
return -1;
}
else if (status > 0) /* value too old */
return 0;
- sdb_log(SDB_LOG_DEBUG, "MK Livestatus backend: Added/updated "
- "service '%s / %s' (last update timestamp = %"PRIsdbTIME").",
+ sdb_log(SDB_LOG_DEBUG, "Added/updated service '%s / %s' "
+ "(last update timestamp = %"PRIsdbTIME").",
hostname, svcname, timestamp);
return 0;
} /* sdb_livestatus_get_svc */
client = SDB_OBJ_WRAPPER(user_data)->data;
if (sdb_unixsock_client_connect(client)) {
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: "
- "Failed to connect to livestatus @ %s.",
+ sdb_log(SDB_LOG_ERR, "Failed to connect to livestatus @ %s.",
sdb_unixsock_client_path(client));
return -1;
}
- sdb_log(SDB_LOG_INFO, "MK Livestatus backend: Successfully "
- "connected to livestatus @ %s.",
+ sdb_log(SDB_LOG_INFO, "Successfully connected to livestatus @ %s.",
sdb_unixsock_client_path(client));
return 0;
} /* sdb_livestatus_init */
status = sdb_unixsock_client_send(client, "GET hosts\r\n"
"Columns: name last_check");
if (status <= 0) {
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to send "
- "'GET hosts' command to livestatus @ %s.",
+ sdb_log(SDB_LOG_ERR, "Failed to send 'GET hosts' command to livestatus @ %s.",
sdb_unixsock_client_path(client));
return -1;
}
if (sdb_unixsock_client_process_lines(client, sdb_livestatus_get_host,
/* user data */ NULL, /* -> EOF */ -1, /* delim */ ";",
/* column count */ 2, SDB_TYPE_STRING, SDB_TYPE_DATETIME)) {
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to read "
- "response from livestatus @ %s while reading hosts.",
- sdb_unixsock_client_path(client));
+ sdb_log(SDB_LOG_ERR, "Failed to read response from livestatus @ %s "
+ "while reading hosts.", sdb_unixsock_client_path(client));
return -1;
}
if ((! sdb_unixsock_client_eof(client))
|| sdb_unixsock_client_error(client)) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to read "
- "host from livestatus @ %s: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to read host from livestatus @ %s: %s",
sdb_unixsock_client_path(client),
sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
status = sdb_unixsock_client_send(client, "GET services\r\n"
"Columns: host_name description last_check");
if (status <= 0) {
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to send "
- "'GET services' command to livestatus @ %s.",
+ sdb_log(SDB_LOG_ERR, "Failed to send 'GET services' command to livestatus @ %s.",
sdb_unixsock_client_path(client));
return -1;
}
/* user data */ NULL, /* -> EOF */ -1, /* delim */ ";",
/* column count */ 3, SDB_TYPE_STRING, SDB_TYPE_STRING,
SDB_TYPE_DATETIME)) {
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to read "
- "response from livestatus @ %s while reading services.",
+ sdb_log(SDB_LOG_ERR, "Failed to read response from livestatus @ %s while reading services.",
sdb_unixsock_client_path(client));
return -1;
}
if ((! sdb_unixsock_client_eof(client))
|| sdb_unixsock_client_error(client)) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to read "
- "services from livestatus @ %s: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to read services from livestatus @ %s: %s",
sdb_unixsock_client_path(client),
sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
int i;
if (oconfig_get_string(ci, &name)) {
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Instance requires "
- "a single string argument\n\tUsage: <Instance NAME>");
+ sdb_log(SDB_LOG_ERR, "Instance requires a single string argument\n"
+ "\tUsage: <Instance NAME>");
return -1;
}
if (! strcasecmp(child->key, "Socket"))
oconfig_get_string(child, &socket_path);
else
- sdb_log(SDB_LOG_WARNING, "MK Livestatus backend: Ignoring "
- "unknown config option '%s' inside <Instance %s>.",
- child->key, name);
+ sdb_log(SDB_LOG_WARNING, "Ignoring unknown config option '%s' "
+ "inside <Instance %s>.", child->key, name);
}
if (! socket_path) {
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Instance '%s' "
- "missing the 'Socket' option.", name);
+ sdb_log(SDB_LOG_ERR, "Instance '%s' missing the 'Socket' option.", name);
return -1;
}
client = sdb_unixsock_client_create(socket_path);
if (! client) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to create "
- "unixsock client: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to create unixsock client: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
(void (*)(void *))sdb_unixsock_client_destroy);
if (! user_data) {
sdb_unixsock_client_destroy(client);
- sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to "
- "allocate sdb_object_t");
+ sdb_log(SDB_LOG_ERR, "Failed to allocate sdb_object_t");
return -1;
}
if (! strcasecmp(child->key, "Instance"))
sdb_livestatus_config_instance(child);
else
- sdb_log(SDB_LOG_WARNING, "MK Livestatus backend: Ignoring "
- "unknown config option '%s'.", child->key);
+ sdb_log(SDB_LOG_WARNING, "Ignoring unknown config option '%s'.", child->key);
}
return 0;
} /* sdb_livestatus_config */
diff --git a/src/plugins/backend/puppet/store-configs.c b/src/plugins/backend/puppet/store-configs.c
index 800e81bdb0e4c2b2192acdd21ad62b8addd4f37b..330ba9de709cc36fbe0fb1123d2ec2099038d57f 100644 (file)
status = sdb_plugin_store_host(hostname, timestamp);
if (status < 0) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: Failed to "
- "store/update host '%s'.", hostname);
+ sdb_log(SDB_LOG_ERR, "Failed to store/update host '%s'.", hostname);
return -1;
}
else if (! status)
- sdb_log(SDB_LOG_DEBUG, "puppet::store-configs backend: "
- "Added/updated host '%s' (last update timestamp = "
- "%"PRIsdbTIME").", hostname, timestamp);
+ sdb_log(SDB_LOG_DEBUG, "Added/updated host '%s' "
+ "(last update timestamp = %"PRIsdbTIME").",
+ hostname, timestamp);
return 0;
} /* sdb_puppet_stcfg_get_hosts */
status = sdb_plugin_store_attribute(hostname, key, &value, last_update);
if (status < 0) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: Failed to "
- "store/update host attribute '%s' for host '%s'.",
- key, hostname);
+ sdb_log(SDB_LOG_ERR, "Failed to store/update host attribute "
+ "'%s' for host '%s'.", key, hostname);
return -1;
}
client = SDB_OBJ_WRAPPER(user_data)->data;
if (sdb_dbi_client_connect(client)) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: "
- "Failed to connect to the storeconfigs DB.");
+ sdb_log(SDB_LOG_ERR, "Failed to connect to the storeconfigs DB.");
return -1;
}
- sdb_log(SDB_LOG_INFO, "puppet::store-configs backend: Successfully "
- "connected to the storeconfigs DB.");
+ sdb_log(SDB_LOG_INFO, "Successfully connected to the storeconfigs DB.");
return 0;
} /* sdb_puppet_stcfg_init */
client = SDB_OBJ_WRAPPER(user_data)->data;
if (sdb_dbi_client_check_conn(client)) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: "
- "Connection to storeconfigs DB failed.");
+ sdb_log(SDB_LOG_ERR, "Connection to storeconfigs DB failed.");
return -1;
}
if (sdb_dbi_exec_query(client, "SELECT name, updated_at FROM hosts;",
sdb_puppet_stcfg_get_hosts, NULL, /* #columns = */ 2,
/* col types = */ SDB_TYPE_STRING, SDB_TYPE_DATETIME)) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: Failed to "
- "retrieve hosts from the storeconfigs DB.");
+ sdb_log(SDB_LOG_ERR, "Failed to retrieve hosts from the storeconfigs DB.");
return -1;
}
sdb_puppet_stcfg_get_attrs, NULL, /* #columns = */ 4,
/* col types = */ SDB_TYPE_STRING, SDB_TYPE_STRING,
SDB_TYPE_STRING, SDB_TYPE_DATETIME)) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: Failed to "
- "retrieve host attributes from the storeconfigs DB.");
+ sdb_log(SDB_LOG_ERR, "Failed to retrieve host attributes from the storeconfigs DB.");
return -1;
}
return 0;
int i;
if (oconfig_get_string(ci, &name)) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: Connection "
- "requires a single string argument\n"
+ sdb_log(SDB_LOG_ERR, "Connection requires a single string argument\n"
"\tUsage: <Connection NAME>");
return -1;
}
if (! strcasecmp(child->key, "DBAdapter")) {
if (oconfig_get_string(child, &driver)) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: "
- "DBAdapter requires a single string argument inside "
- "<Connection %s>\n\tUsage: DBAdapter NAME",
- name);
+ sdb_log(SDB_LOG_ERR, "DBAdapter requires a single string argument "
+ "inside <Connection %s>\n\tUsage: DBAdapter NAME", name);
}
continue;
}
else if (! strcasecmp(child->key, "DBName")) {
if (oconfig_get_string(child, &database)) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: "
- "DBName requires a single string argument inside "
- "<Connection %s>\n\tUsage: DBName NAME",
- name);
+ sdb_log(SDB_LOG_ERR, "DBName requires a single string argument "
+ "inside <Connection %s>\n\tUsage: DBName NAME", name);
}
continue;
}
if ((child->values_num != 2)
|| (child->values[0].type != OCONFIG_TYPE_STRING)
|| (child->values[1].type != OCONFIG_TYPE_STRING)) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: "
- "DBIOption requires exactly two string arguments "
- "inside <Connection %s>\n"
- "\tUsage: DBIOption KEY VALUE", name);
+ sdb_log(SDB_LOG_ERR, "DBIOption requires exactly two string arguments "
+ "inside <Connection %s>\n\tUsage: DBIOption KEY VALUE", name);
continue;
}
value = child->values[1].value.string;
}
else {
- sdb_log(SDB_LOG_WARNING, "puppet::store-configs backend: "
- "Ignoring unknown config option '%s' inside "
- "<Connection %s>.", child->key, name);
+ sdb_log(SDB_LOG_WARNING, "Ignoring unknown config option '%s' "
+ "inside <Connection %s>.", child->key, name);
continue;
}
if (status) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: Option "
- "'%s' requires a single string argument inside "
- "<Connection %s>\n\tUsage: DBAdapter NAME",
+ sdb_log(SDB_LOG_ERR, "Option '%s' requires a single string argument "
+ "inside <Connection %s>\n\tUsage: DBAdapter NAME",
child->key, name);
continue;
}
if (! options) {
if (! (options = sdb_dbi_options_create())) {
char errmsg[1024];
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: "
- "Failed to create DBI options object: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to create DBI options object: %s",
sdb_strerror(errno, errmsg, sizeof(errmsg)));
continue;
}
if (sdb_dbi_options_add(options, key, value)) {
char errmsg[1024];
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: "
- "Failed to add option '%s': %s", key,
+ sdb_log(SDB_LOG_ERR, "Failed to add option '%s': %s", key,
sdb_strerror(errno, errmsg, sizeof(errmsg)));
continue;
}
}
if (! driver) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: "
- "Connection '%s' " "missing the 'DBAdapter' option.",
- name);
+ sdb_log(SDB_LOG_ERR, "Connection '%s' " "missing the 'DBAdapter' option.", name);
return -1;
}
if (! database) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: "
- "Connection '%s' missing the 'DBName' option.", name);
+ sdb_log(SDB_LOG_ERR, "Connection '%s' missing the 'DBName' option.", name);
return -1;
}
client = sdb_dbi_client_create(driver, database);
if (! client) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: "
- "Failed to create DBI client: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to create DBI client: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
(void (*)(void *))sdb_dbi_client_destroy);
if (! user_data) {
sdb_dbi_client_destroy(client);
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: "
- "Failed to allocate sdb_object_t");
+ sdb_log(SDB_LOG_ERR, "Failed to allocate sdb_object_t");
return -1;
}
if (! strcasecmp(child->key, "Connection"))
sdb_puppet_stcfg_config_conn(child);
else
- sdb_log(SDB_LOG_WARNING, "puppet::store-configs backend: "
- "Ignoring unknown config option '%s'.", child->key);
+ sdb_log(SDB_LOG_WARNING, "Ignoring unknown config option '%s'.", child->key);
}
return 0;
} /* sdb_puppet_stcfg_config */
index 0b17d963af691519faa260d628004fc08e41b857..0c08d991665c489dba904996ea183dd572b26489 100644 (file)
--- a/src/plugins/cname/dns.c
+++ b/src/plugins/cname/dns.c
err = getaddrinfo(name, /* service = */ NULL, &hints, &ret);
if (err) {
/* XXX: what to do about EAI_AGAIN? */
- sdb_log(SDB_LOG_ERR, "cname::dns: Failed to resolve '%s': %s",
+ sdb_log(SDB_LOG_ERR, "Failed to resolve '%s': %s",
name, gai_strerror(err));
return NULL;
}
index 703696fb38dde4ce1ac1c72109f9c19d15917f16..7e79378aa83a1fb0f2f34d39d40c52b9ca18c7d3 100644 (file)
sdb_memstore_t *store = SDB_MEMSTORE(user_data);
if (! store) {
- sdb_log(SDB_LOG_ERR, "store: Failed to allocate store");
+ sdb_log(SDB_LOG_ERR, "Failed to allocate store");
return -1;
}
if (sdb_plugin_register_writer("memstore",
if (! store) {
if (! (store = sdb_memstore_create())) {
- sdb_log(SDB_LOG_ERR, "store::memory plugin: "
- "Failed to create store object");
+ sdb_log(SDB_LOG_ERR, "Failed to create store object");
return -1;
}
}
index 79df1070d1ba10e02b054b5ed3769cd0c0d8ec91..fc416fe34b978de5c93515030797118af7579051 100644 (file)
if (sdb_client_eof(ud->client)) {
sdb_client_close(ud->client);
if (sdb_client_connect(ud->client, ud->username)) {
- sdb_log(SDB_LOG_ERR, "store::network: Failed to reconnect "
- "to SysDB at %s as user %s", ud->addr, ud->username);
+ sdb_log(SDB_LOG_ERR, "Failed to reconnect to SysDB "
+ "at %s as user %s", ud->addr, ud->username);
return -1;
}
- sdb_log(SDB_LOG_INFO, "store::network: Successfully reconnected "
- "to SysDB at %s as user %s", ud->addr, ud->username);
+ sdb_log(SDB_LOG_INFO, "Successfully reconnected to SysDB "
+ "at %s as user %s", ud->addr, ud->username);
}
status = sdb_client_rpc(ud->client, SDB_CONNECTION_STORE,
(uint32_t)msg_len, msg, &rstatus, buf);
if (status < 0)
- sdb_log(SDB_LOG_ERR, "store::network: %s", sdb_strbuf_string(buf));
+ sdb_log(SDB_LOG_ERR, "%s", sdb_strbuf_string(buf));
else if (rstatus != SDB_CONNECTION_OK) {
- sdb_log(SDB_LOG_ERR, "store::network: Failed to send object: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to send object: %s",
sdb_strbuf_string(buf));
status = -1;
}
ud = SDB_OBJ_WRAPPER(user_data)->data;
if (sdb_client_connect(ud->client, ud->username)) {
- sdb_log(SDB_LOG_ERR, "store::network: Failed to connect "
- "to SysDB at %s as user %s", ud->addr, ud->username);
+ sdb_log(SDB_LOG_ERR, "Failed to connect to SysDB "
+ "at %s as user %s", ud->addr, ud->username);
return -1;
}
- sdb_log(SDB_LOG_INFO, "store::network: Successfully connected "
- "to SysDB at %s as user %s", ud->addr, ud->username);
+ sdb_log(SDB_LOG_INFO, "Successfully connected to SysDB "
+ "at %s as user %s", ud->addr, ud->username);
return 0;
} /* store_init */
ud = calloc(1, sizeof(*ud));
if (! ud) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "store::network: Failed to allocate "
- "a user-data object: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to allocate a user-data object: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
if (oconfig_get_string(ci, &ud->addr)) {
- sdb_log(SDB_LOG_ERR, "store::network: Server requires "
- "a single string argument\n\tUsage: <Server ADDRESS>");
+ sdb_log(SDB_LOG_ERR, "Server requires a single string argument\n"
+ "\tUsage: <Server ADDRESS>");
user_data_destroy(ud);
return -1;
}
ud->addr = strdup(ud->addr);
if (! ud->addr) {
- sdb_log(SDB_LOG_ERR, "store::network: Failed to duplicate "
- "a string");
+ sdb_log(SDB_LOG_ERR, "Failed to duplicate a string");
user_data_destroy(ud);
return -1;
}
ud->client = sdb_client_create(ud->addr);
if (! ud->client) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "store::network: Failed to create client "
- "connecting to '%s': %s", ud->addr,
- sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ sdb_log(SDB_LOG_ERR, "Failed to create client connecting to '%s': %s",
+ ud->addr, sdb_strerror(errno, errbuf, sizeof(errbuf)));
user_data_destroy(ud);
return -1;
}
ud->ssl_opts.ca_file = strdup(tmp);
}
else
- sdb_log(SDB_LOG_WARNING, "store::network: Ignoring "
- "unknown config option '%s' inside <Server %s>.",
- child->key, ud->addr);
+ sdb_log(SDB_LOG_WARNING, "Ignoring unknown config option '%s' "
+ "inside <Server %s>.", child->key, ud->addr);
}
if (ret) {
ud->username = sdb_get_current_user();
if (sdb_client_set_ssl_options(ud->client, &ud->ssl_opts)) {
- sdb_log(SDB_LOG_ERR, "store::network: Failed to apply SSL options");
+ sdb_log(SDB_LOG_ERR, "Failed to apply SSL options");
user_data_destroy(ud);
return -1;
}
user_data_destroy);
if (! user_data) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "store::network: Failed to allocate "
- "a user-data wrapper object: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to allocate a user-data wrapper object: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
user_data_destroy(ud);
return -1;
if (! strcasecmp(child->key, "Server"))
store_config_server(child);
else
- sdb_log(SDB_LOG_WARNING, "store::network: Ignoring "
- "unknown config option '%s'.", child->key);
+ sdb_log(SDB_LOG_WARNING, "Ignoring unknown config option '%s'.",
+ child->key);
}
return 0;
} /* store_config */
diff --git a/src/plugins/syslog.c b/src/plugins/syslog.c
index 8bf16774370f39a4bef6c8ad08e605b602f2b4a3..a2a898922e9e1eb8fd2a6d76001948e0c6702a54 100644 (file)
--- a/src/plugins/syslog.c
+++ b/src/plugins/syslog.c
if (! strcasecmp(child->key, "LogLevel")) {
char *level = NULL;
if (oconfig_get_string(child, &level)) {
- sdb_log(SDB_LOG_ERR, "syslog plugin: LogLevel requires "
- "a single string argument\n\tUsage: Loglevel LEVEL");
+ sdb_log(SDB_LOG_ERR, "LogLevel requires a single string argument\n"
+ "\tUsage: Loglevel LEVEL");
return -1;
}
loglevel = sdb_error_parse_priority(level);
if (loglevel < 0) {
loglevel = SDB_DEFAULT_LOGLEVEL;
- sdb_log(SDB_LOG_ERR,
- "syslog plugin: Invalid loglevel: '%s'", level);
+ sdb_log(SDB_LOG_ERR, "Invalid loglevel: '%s'", level);
return -1;
}
- sdb_log(SDB_LOG_INFO, "syslog plugin: Log-level set to %s",
+ sdb_log(SDB_LOG_INFO, "Log-level set to %s",
SDB_LOG_PRIO_TO_STRING(loglevel));
}
else
- sdb_log(SDB_LOG_WARNING, "syslog plugin: Ignoring unknown config "
- "option '%s'.", child->key);
+ sdb_log(SDB_LOG_WARNING, "Ignoring unknown config option '%s'.", child->key);
}
return 0;
} /* syslog_config */
index 8a3854f6321f34d3148fefd1d515c95b19cc9e95..8ab7f69e20b5f728a1d439922c1a22d849e7eaa5 100644 (file)
rrd_clear_error();
if (! rrdc_is_connected(addr)) {
if (rrdc_connect(addr)) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to "
- "connectd to RRDCacheD at %s: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to connectd to RRDCacheD at %s: %s",
addr, rrd_get_error());
return 0;
}
}
#else
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Callback called with "
- "RRDCacheD address but your build of SysDB does not support "
- "that");
+ sdb_log(SDB_LOG_ERR, "Callback called with RRDCacheD address "
+ "but your build of SysDB does not support that");
return 0;
#endif
return 1;
#ifdef HAVE_RRD_CLIENT_H
/* TODO: detect and use rrdc_info if possible */
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: DESCRIBE not yet "
- "supported via RRDCacheD");
+ sdb_log(SDB_LOG_ERR, "DESCRIBE not yet supported via RRDCacheD");
return NULL;
#endif
}
info = rrd_info_r(filename);
}
if (! info) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to extract "
- "header information from '%s': %s", filename,
- rrd_get_error());
+ sdb_log(SDB_LOG_ERR, "Failed to extract header information from '%s': %s",
+ filename, rrd_get_error());
return NULL;
}
ts_info = calloc(1, sizeof(*ts_info));
if (! ts_info) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to allocate memory");
+ sdb_log(SDB_LOG_ERR, "Failed to allocate memory");
rrd_info_free(info);
return NULL;
}
tmp = realloc(ts_info->data_names,
(ts_info->data_names_len + 1) * sizeof(*ts_info->data_names));
if (! tmp) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to allocate memory");
+ sdb_log(SDB_LOG_ERR, "Failed to allocate memory");
sdb_timeseries_info_destroy(ts_info);
rrd_info_free(info);
return NULL;
ts_info->data_names = tmp;
ts_info->data_names[ts_info->data_names_len] = strdup(ds_name);
if (! ts_info->data_names[ts_info->data_names_len]) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to allocate memory");
+ sdb_log(SDB_LOG_ERR, "Failed to allocate memory");
sdb_timeseries_info_destroy(ts_info);
rrd_info_free(info);
return NULL;
#ifdef HAVE_RRD_CLIENT_H
if (rrdc_flush(id)) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to flush "
- "'%s' through RRDCacheD: %s", id, rrd_get_error());
+ sdb_log(SDB_LOG_ERR, "Failed to flush '%s' through RRDCacheD: %s",
+ id, rrd_get_error());
return NULL;
}
#endif
&ds_cnt, &ds_namv, &data)) {
char errbuf[1024];
sdb_strerror(errno, errbuf, sizeof(errbuf));
- sdb_log(SDB_LOG_ERR, "rrdtool plugin: Failed to fetch data "
- "from %s: %s", id, errbuf);
+ sdb_log(SDB_LOG_ERR, "Failed to fetch data from %s: %s", id, errbuf);
return NULL;
}
if (! ts) {
char errbuf[1024];
sdb_strerror(errno, errbuf, sizeof(errbuf));
- sdb_log(SDB_LOG_ERR, "rrdtool plugin: Failed to allocate "
- "time-series object: %s", errbuf);
+ sdb_log(SDB_LOG_ERR, "Failed to allocate time-series object: %s", errbuf);
FREE_RRD_DATA();
return NULL;
}
char *addr = NULL;
if (rrdcached_in_use) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: RRDCacheD does "
- "not support multiple connections");
+ sdb_log(SDB_LOG_ERR, "RRDCacheD does not support multiple connections");
return -1;
}
#ifndef HAVE_RRD_CLIENT_H
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: RRDCacheD client "
- "support not available in your SysDB build");
+ sdb_log(SDB_LOG_ERR, "RRDCacheD client support not available in your SysDB build");
return -1;
#else
if (oconfig_get_string(ci, &addr)) {
- sdb_log(SDB_LOG_ERR, "timeseries::unixsock: RRDCacheD requires "
- "a single string argument\n\tUsage <RRDCacheD ADDR>");
+ sdb_log(SDB_LOG_ERR, "RRDCacheD requires a single string argument\n"
+ "\tUsage <RRDCacheD ADDR>");
return -1;
}
if ((*addr != '/') && strncmp(addr, "unix:", strlen("unix:"))) {
/* XXX: add (optional) support for rrdc_fetch if available */
- sdb_log(SDB_LOG_ERR, "timeseries::unixsock: RRDCacheD only "
- "supports local (UNIX socket) addresses");
+ sdb_log(SDB_LOG_ERR, "RRDCacheD only supports local (UNIX socket) addresses");
return -1;
}
addr = strdup(addr);
if (! addr) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "timeseries::unixsock: Failed to duplicate "
- "string: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ sdb_log(SDB_LOG_ERR, "Failed to duplicate string: %s",
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
if (ci->children_num)
- sdb_log(SDB_LOG_WARNING, "timeseries::unixsock: RRDCacheD does "
- "not support any child config options");
+ sdb_log(SDB_LOG_WARNING, "RRDCacheD does not support any child config options");
ud = sdb_object_create_wrapper("rrdcached-addr", addr, free);
if (! ud) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "timeseries::unixsock: Failed to create "
- "user-data object: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to create user-data object: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
free(addr);
return -1;
if (! strcasecmp(child->key, "RRDCacheD"))
sdb_rrd_config_rrdcached(child);
else
- sdb_log(SDB_LOG_WARNING, "timeseries::rrdtool: Ignoring "
- "unknown config option '%s'.", child->key);
+ sdb_log(SDB_LOG_WARNING, "Ignoring unknown config option '%s'.", child->key);
}
return 0;
} /* sdb_rrd_config */
diff --git a/src/utils/os.c b/src/utils/os.c
index 70142f7ba8d6ab093bf907e38e47cc8e8ae30159..653d88d05585ffe217343e1e2a1adbbea04296d6 100644 (file)
--- a/src/utils/os.c
+++ b/src/utils/os.c
if (status || (! result)) {
char errbuf[1024];
- sdb_log(SDB_LOG_WARNING, "os: Failed to determine home directory "
+ sdb_log(SDB_LOG_WARNING, "Failed to determine home directory "
"for user %s: %s", username,
sdb_strerror(errno, errbuf, sizeof(errbuf)));
free(username);
diff --git a/src/utils/ssl.c b/src/utils/ssl.c
index fdb170d2b2da42b588dbaec40b33bd2afde5ab8a..12beac528fbcfb36d9643469fb8213159ee6a80a 100644 (file)
--- a/src/utils/ssl.c
+++ b/src/utils/ssl.c
if (errno) {
char errbuf[1024];
- sdb_log(prio, "%s: %s", msg,
- sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ sdb_log(prio, "%s: %s", msg, sdb_strerror(errno, errbuf, sizeof(errbuf)));
}
} /* ssl_log_err */