Made log prefixes slightly more generic.

Changed "plugin" to "core" and "sock" to "frontend". Those names better
identify the context in which the error happened.

diff --git a/src/core/plugin.c b/src/core/plugin.c
index 472396fa5bb0efd20944d06c5e60e8ac733c5741..09d5ccea3ebdcd4fbcc01465ee827e2e313cfd35 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
@@ -218,7 +218,7 @@ plugin_unregister_by_name(const char *plugin_name)
                        if (! obj)
                                break;
 
                        if (! obj)
                                break;
 

-                       sdb_log(SDB_LOG_INFO, "plugin: Unregistering "
+                       sdb_log(SDB_LOG_INFO, "core: Unregistering "

                                        "%s callback '%s' (module %s)", type, obj->name,
                                        cb->cb_ctx->info.plugin_name);
                        sdb_object_deref(obj);
                                        "%s callback '%s' (module %s)", type, obj->name,
                                        cb->cb_ctx->info.plugin_name);
                        sdb_object_deref(obj);


@@ -305,7 +305,7 @@ plugin_cb_init(sdb_object_t *obj, va_list ap)
        assert(obj);
 
        if (sdb_llist_search_by_name(*list, obj->name)) {
        assert(obj);
 
        if (sdb_llist_search_by_name(*list, obj->name)) {

-               sdb_log(SDB_LOG_WARNING, "plugin: %s callback '%s' "
+               sdb_log(SDB_LOG_WARNING, "core: %s callback '%s' "

                                "has already been registered. Ignoring newly "
                                "registered version.", type, obj->name);
                return -1;
                                "has already been registered. Ignoring newly "
                                "registered version.", type, obj->name);
                return -1;


@@ -371,7 +371,7 @@ plugin_add_callback(sdb_llist_t **list, const char *type,
        /* pass control to the list */
        sdb_object_deref(obj);
 
        /* pass control to the list */
        sdb_object_deref(obj);
 

-       sdb_log(SDB_LOG_INFO, "plugin: Registered %s callback '%s'.",
+       sdb_log(SDB_LOG_INFO, "core: Registered %s callback '%s'.",

                        type, name);
        return 0;
 } /* plugin_add_callback */
                        type, name);
        return 0;
 } /* plugin_add_callback */


@@ -414,7 +414,7 @@ sdb_plugin_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
 
        if (access(filename, R_OK)) {
                char errbuf[1024];
 
        if (access(filename, R_OK)) {
                char errbuf[1024];

-               sdb_log(SDB_LOG_ERR, "plugin: Failed to load plugin '%s' (%s): %s",
+               sdb_log(SDB_LOG_ERR, "core: Failed to load plugin '%s' (%s): %s",

                                name, filename, sdb_strerror(errno, errbuf, sizeof(errbuf)));
                return -1;
        }
                                name, filename, sdb_strerror(errno, errbuf, sizeof(errbuf)));
                return -1;
        }


@@ -424,18 +424,18 @@ sdb_plugin_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
 
        lh = lt_dlopen(filename);
        if (! lh) {
 
        lh = lt_dlopen(filename);
        if (! lh) {

-               sdb_log(SDB_LOG_ERR, "plugin: Failed to load plugin '%s': %s"
+               sdb_log(SDB_LOG_ERR, "core: 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())
                                "The most common cause for this problem are missing "
                                "dependencies.\n", name, lt_dlerror());
                return -1;
        }
 
        if (ctx_get())

-               sdb_log(SDB_LOG_WARNING, "plugin: Discarding old plugin context");
+               sdb_log(SDB_LOG_WARNING, "core: Discarding old plugin context");

 
        ctx = ctx_create();
        if (! ctx) {
 
        ctx = ctx_create();
        if (! ctx) {

-               sdb_log(SDB_LOG_ERR, "plugin: Failed to initialize plugin context");
+               sdb_log(SDB_LOG_ERR, "core: Failed to initialize plugin context");

                return -1;
        }
 
                return -1;
        }
 


@@ -447,7 +447,7 @@ sdb_plugin_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
 
        mod_init = (int (*)(sdb_plugin_info_t *))lt_dlsym(lh, "sdb_module_init");
        if (! mod_init) {
 
        mod_init = (int (*)(sdb_plugin_info_t *))lt_dlsym(lh, "sdb_module_init");
        if (! mod_init) {

-               sdb_log(SDB_LOG_ERR, "plugin: Failed to load plugin '%s': "
+               sdb_log(SDB_LOG_ERR, "core: Failed to load plugin '%s': "

                                "could not find symbol 'sdb_module_init'", name);
                sdb_object_deref(SDB_OBJ(ctx));
                return -1;
                                "could not find symbol 'sdb_module_init'", name);
                sdb_object_deref(SDB_OBJ(ctx));
                return -1;


@@ -455,7 +455,7 @@ sdb_plugin_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
 
        status = mod_init(&ctx->info);
        if (status) {
 
        status = mod_init(&ctx->info);
        if (status) {

-               sdb_log(SDB_LOG_ERR, "plugin: Failed to initialize "
+               sdb_log(SDB_LOG_ERR, "core: Failed to initialize "

                                "module '%s'", name);
                plugin_unregister_by_name(ctx->info.plugin_name);
                sdb_object_deref(SDB_OBJ(ctx));
                                "module '%s'", name);
                plugin_unregister_by_name(ctx->info.plugin_name);
                sdb_object_deref(SDB_OBJ(ctx));


@@ -465,13 +465,13 @@ sdb_plugin_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
        /* compare minor version */
        if ((ctx->info.version < 0)
                        || ((int)(ctx->info.version / 100) != (int)(SDB_VERSION / 100)))
        /* compare minor version */
        if ((ctx->info.version < 0)
                        || ((int)(ctx->info.version / 100) != (int)(SDB_VERSION / 100)))

-               sdb_log(SDB_LOG_WARNING, "plugin: WARNING: version of "
+               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_VERSION_DECODE(SDB_VERSION));
 
                                "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_VERSION_DECODE(SDB_VERSION));
 

-       sdb_log(SDB_LOG_INFO, "plugin: Successfully loaded "
+       sdb_log(SDB_LOG_INFO, "core: Successfully loaded "

                        "plugin '%s' v%i (%s)\n\t%s\n\tLicense: %s",
                        INFO_GET(&ctx->info, name), ctx->info.plugin_version,
                        INFO_GET(&ctx->info, description),
                        "plugin '%s' v%i (%s)\n\t%s\n\tLicense: %s",
                        INFO_GET(&ctx->info, name), ctx->info.plugin_version,
                        INFO_GET(&ctx->info, description),


@@ -626,7 +626,7 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
 
        if (! (SDB_PLUGIN_CCB(obj)->ccb_next_update = sdb_gettime())) {
                char errbuf[1024];
 
        if (! (SDB_PLUGIN_CCB(obj)->ccb_next_update = sdb_gettime())) {
                char errbuf[1024];

-               sdb_log(SDB_LOG_ERR, "plugin: Failed to determine current "
+               sdb_log(SDB_LOG_ERR, "core: Failed to determine current "

                                "time: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
                sdb_object_deref(obj);
                return -1;
                                "time: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
                sdb_object_deref(obj);
                return -1;


@@ -641,7 +641,7 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
        /* pass control to the list */
        sdb_object_deref(obj);
 
        /* pass control to the list */
        sdb_object_deref(obj);
 

-       sdb_log(SDB_LOG_INFO, "plugin: Registered collector callback '%s' "
+       sdb_log(SDB_LOG_INFO, "core: Registered collector callback '%s' "

                        "(interval = %.3fs).", name,
                        SDB_TIME_TO_DOUBLE(SDB_PLUGIN_CCB(obj)->ccb_interval));
        return 0;
                        "(interval = %.3fs).", name,
                        SDB_TIME_TO_DOUBLE(SDB_PLUGIN_CCB(obj)->ccb_interval));
        return 0;


@@ -654,7 +654,7 @@ sdb_plugin_get_ctx(void)
 
        c = ctx_get();
        if (! c) {
 
        c = ctx_get();
        if (! c) {

-               sdb_plugin_log(SDB_LOG_ERR, "plugin: Invalid read access to plugin "
+               sdb_plugin_log(SDB_LOG_ERR, "core: Invalid read access to plugin "

                                "context outside a plugin");
                return plugin_default_ctx;
        }
                                "context outside a plugin");
                return plugin_default_ctx;
        }


@@ -668,7 +668,7 @@ sdb_plugin_set_ctx(sdb_plugin_ctx_t ctx, sdb_plugin_ctx_t *old)
 
        c = ctx_get();
        if (! c) {
 
        c = ctx_get();
        if (! c) {

-               sdb_plugin_log(SDB_LOG_ERR, "plugin: Invalid write access to plugin "
+               sdb_plugin_log(SDB_LOG_ERR, "core: Invalid write access to plugin "

                                "context outside a plugin");
                return -1;
        }
                                "context outside a plugin");
                return -1;
        }


@@ -695,7 +695,7 @@ sdb_plugin_configure(const char *name, oconfig_item_t *ci)
        plugin = SDB_PLUGIN_CB(sdb_llist_search_by_name(config_list, name));
        if (! plugin) {
                /* XXX: check if any such plugin has been loaded */
        plugin = SDB_PLUGIN_CB(sdb_llist_search_by_name(config_list, name));
        if (! plugin) {
                /* XXX: check if any such plugin has been loaded */

-               sdb_log(SDB_LOG_ERR, "plugin: Plugin '%s' did not register "
+               sdb_log(SDB_LOG_ERR, "core: Plugin '%s' did not register "

                                "a config callback.", name);
                errno = ENOENT;
                return -1;
                                "a config callback.", name);
                errno = ENOENT;
                return -1;


@@ -728,7 +728,7 @@ sdb_plugin_init_all(void)
 
                old_ctx = ctx_set(cb->cb_ctx);
                if (callback(cb->cb_user_data)) {
 
                old_ctx = ctx_set(cb->cb_ctx);
                if (callback(cb->cb_user_data)) {

-                       sdb_log(SDB_LOG_ERR, "plugin: Failed to initialize plugin "
+                       sdb_log(SDB_LOG_ERR, "core: Failed to initialize plugin "

                                        "'%s'. Unregistering all callbacks.", obj->name);
                        plugin_unregister_by_name(cb->cb_ctx->info.plugin_name);
                        ++ret;
                                        "'%s'. Unregistering all callbacks.", obj->name);
                        plugin_unregister_by_name(cb->cb_ctx->info.plugin_name);
                        ++ret;


@@ -743,7 +743,7 @@ int
 sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 {
        if (! collector_list) {
 sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 {
        if (! collector_list) {

-               sdb_log(SDB_LOG_WARNING, "plugin: No collectors registered. "
+               sdb_log(SDB_LOG_WARNING, "core: No collectors registered. "

                                "Quiting main loop.");
                return -1;
        }
                                "Quiting main loop.");
                return -1;
        }


@@ -765,8 +765,9 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 
                if (! (now = sdb_gettime())) {
                        char errbuf[1024];
 
                if (! (now = sdb_gettime())) {
                        char errbuf[1024];

-                       sdb_log(SDB_LOG_ERR, "plugin: Failed to determine current "
-                                       "time: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+                       sdb_log(SDB_LOG_ERR, "core: Failed to determine current "
+                                       "time in collector main loop: %s",
+                                       sdb_strerror(errno, errbuf, sizeof(errbuf)));

                        now = SDB_PLUGIN_CCB(obj)->ccb_next_update;
                }
 
                        now = SDB_PLUGIN_CCB(obj)->ccb_next_update;
                }
 


@@ -777,7 +778,8 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
                        while (loop->do_loop && sdb_sleep(interval, &interval)) {
                                if (errno != EINTR) {
                                        char errbuf[1024];
                        while (loop->do_loop && sdb_sleep(interval, &interval)) {
                                if (errno != EINTR) {
                                        char errbuf[1024];

-                                       sdb_log(SDB_LOG_ERR, "plugin: Failed to sleep: %s",
+                                       sdb_log(SDB_LOG_ERR, "core: Failed to sleep "
+                                                       "in collector main loop: %s",

                                                        sdb_strerror(errno, errbuf, sizeof(errbuf)));
                                        return -1;
                                }
                                                        sdb_strerror(errno, errbuf, sizeof(errbuf)));
                                        return -1;
                                }


@@ -798,7 +800,7 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
                if (! interval)
                        interval = loop->default_interval;
                if (! interval) {
                if (! interval)
                        interval = loop->default_interval;
                if (! interval) {

-                       sdb_log(SDB_LOG_WARNING, "plugin: No interval configured "
+                       sdb_log(SDB_LOG_WARNING, "core: No interval configured "

                                        "for plugin '%s'; skipping any further "
                                        "iterations.", obj->name);
                        sdb_object_deref(obj);
                                        "for plugin '%s'; skipping any further "
                                        "iterations.", obj->name);
                        sdb_object_deref(obj);


@@ -809,13 +811,14 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 
                if (! (now = sdb_gettime())) {
                        char errbuf[1024];
 
                if (! (now = sdb_gettime())) {
                        char errbuf[1024];

-                       sdb_log(SDB_LOG_ERR, "plugin: Failed to determine current "
-                                       "time: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+                       sdb_log(SDB_LOG_ERR, "core: Failed to determine current "
+                                       "time in collector main loop: %s",
+                                       sdb_strerror(errno, errbuf, sizeof(errbuf)));

                        now = SDB_PLUGIN_CCB(obj)->ccb_next_update;
                }
 
                if (now > SDB_PLUGIN_CCB(obj)->ccb_next_update) {
                        now = SDB_PLUGIN_CCB(obj)->ccb_next_update;
                }
 
                if (now > SDB_PLUGIN_CCB(obj)->ccb_next_update) {

-                       sdb_log(SDB_LOG_WARNING, "plugin: Plugin '%s' took too "
+                       sdb_log(SDB_LOG_WARNING, "core: Plugin '%s' took too "

                                        "long; skipping iterations to keep up.",
                                        obj->name);
                        SDB_PLUGIN_CCB(obj)->ccb_next_update = now;
                                        "long; skipping iterations to keep up.",
                                        obj->name);
                        SDB_PLUGIN_CCB(obj)->ccb_next_update = now;


@@ -823,7 +826,7 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 
                if (sdb_llist_insert_sorted(collector_list, obj,
                                        plugin_cmp_next_update)) {
 
                if (sdb_llist_insert_sorted(collector_list, obj,
                                        plugin_cmp_next_update)) {

-                       sdb_log(SDB_LOG_ERR, "plugin: Failed to re-insert "
+                       sdb_log(SDB_LOG_ERR, "core: Failed to re-insert "

                                        "plugin '%s' into collector list. Unable to further "
                                        "use the plugin.",
                                        obj->name);
                                        "plugin '%s' into collector list. Unable to further "
                                        "use the plugin.",
                                        obj->name);

diff --git a/src/frontend/sock.c b/src/frontend/sock.c
index e2c52ce31b2cbf3a0dba089187de4efd8ceac5fb..f6656875e4d82a192d1da28b099366ca4913fd4b 100644 (file)
--- a/src/frontend/sock.c
+++ b/src/frontend/sock.c
@@ -90,7 +90,7 @@ open_unix_sock(listener_t *listener)
        listener->sock_fd = socket(AF_UNIX, SOCK_STREAM, 0);
        if (listener->sock_fd < 0) {
                char buf[1024];
        listener->sock_fd = socket(AF_UNIX, SOCK_STREAM, 0);
        if (listener->sock_fd < 0) {
                char buf[1024];

-               sdb_log(SDB_LOG_ERR, "sock: Failed to open UNIX socket %s: %s",
+               sdb_log(SDB_LOG_ERR, "frontend: Failed to open UNIX socket %s: %s",

                                listener->address, sdb_strerror(errno, buf, sizeof(buf)));
                return -1;
        }
                                listener->address, sdb_strerror(errno, buf, sizeof(buf)));
                return -1;
        }


@@ -103,7 +103,7 @@ open_unix_sock(listener_t *listener)
        status = bind(listener->sock_fd, (struct sockaddr *)&sa, sizeof(sa));
        if (status) {
                char buf[1024];
        status = bind(listener->sock_fd, (struct sockaddr *)&sa, sizeof(sa));
        if (status) {
                char buf[1024];

-               sdb_log(SDB_LOG_ERR, "sock: Failed to bind to UNIX socket %s: %s",
+               sdb_log(SDB_LOG_ERR, "frontend: Failed to bind to UNIX socket %s: %s",

                                listener->address, sdb_strerror(errno, buf, sizeof(buf)));
                return -1;
        }
                                listener->address, sdb_strerror(errno, buf, sizeof(buf)));
                return -1;
        }


@@ -173,7 +173,7 @@ listener_create(sdb_fe_socket_t *sock, const char *address)
 
        type = get_type(address);
        if (type < 0) {
 
        type = get_type(address);
        if (type < 0) {

-               sdb_log(SDB_LOG_ERR, "sock: Unsupported address type specified "
+               sdb_log(SDB_LOG_ERR, "frontend: Unsupported address type specified "

                                "in listen address '%s'", address);
                return NULL;
        }
                                "in listen address '%s'", address);
                return NULL;
        }


@@ -182,7 +182,7 @@ listener_create(sdb_fe_socket_t *sock, const char *address)
                        sock->listeners_num * sizeof(*sock->listeners));
        if (! listener) {
                char buf[1024];
                        sock->listeners_num * sizeof(*sock->listeners));
        if (! listener) {
                char buf[1024];

-               sdb_log(SDB_LOG_ERR, "sock: Failed to allocate memory: %s",
+               sdb_log(SDB_LOG_ERR, "frontend: Failed to allocate memory: %s",

                                sdb_strerror(errno, buf, sizeof(buf)));
                return NULL;
        }
                                sdb_strerror(errno, buf, sizeof(buf)));
                return NULL;
        }


@@ -194,7 +194,7 @@ listener_create(sdb_fe_socket_t *sock, const char *address)
        listener->address = strdup(address);
        if (! listener->address) {
                char buf[1024];
        listener->address = strdup(address);
        if (! listener->address) {
                char buf[1024];

-               sdb_log(SDB_LOG_ERR, "sock: Failed to allocate memory: %s",
+               sdb_log(SDB_LOG_ERR, "frontend: Failed to allocate memory: %s",

                                sdb_strerror(errno, buf, sizeof(buf)));
                listener_destroy(listener);
                return NULL;
                                sdb_strerror(errno, buf, sizeof(buf)));
                listener_destroy(listener);
                return NULL;


@@ -237,7 +237,7 @@ connection_handler(void *data)
                        if (errno == EBADF) /* channel shut down */
                                break;
 
                        if (errno == EBADF) /* channel shut down */
                                break;
 

-                       sdb_log(SDB_LOG_ERR, "sock: Failed to read from channel: %s",
+                       sdb_log(SDB_LOG_ERR, "frontend: Failed to read from channel: %s",

                                        sdb_strerror(errno, buf, sizeof(buf)));
                        continue;
                }
                                        sdb_strerror(errno, buf, sizeof(buf)));
                        continue;
                }


@@ -246,13 +246,14 @@ connection_handler(void *data)
                        continue;
 
                if (conn.client_addr.ss_family != AF_UNIX) {
                        continue;
 
                if (conn.client_addr.ss_family != AF_UNIX) {

-                       sdb_log(SDB_LOG_ERR, "sock: Accepted connection using unexpected "
-                                       "family type %d", conn.client_addr.ss_family);
+                       sdb_log(SDB_LOG_ERR, "frontend: Accepted connection using "
+                                       "unexpected family type %d", conn.client_addr.ss_family);

                        continue;
                }
 
                /* XXX */
                        continue;
                }
 
                /* XXX */

-               sdb_log(SDB_LOG_INFO, "Accepted connection on fd=%i\n", conn.fd);
+               sdb_log(SDB_LOG_INFO, "frontend: Accepted connection on fd=%i\n",
+                               conn.fd);

                close(conn.fd);
        }
        return NULL;
                close(conn.fd);
        }
        return NULL;


@@ -324,7 +325,7 @@ sdb_fe_sock_listen_and_serve(sdb_fe_socket_t *sock, sdb_fe_loop_t *loop)
 
                if (listen(listener->sock_fd, /* backlog = */ 32)) {
                        char buf[1024];
 
                if (listen(listener->sock_fd, /* backlog = */ 32)) {
                        char buf[1024];

-                       sdb_log(SDB_LOG_ERR, "sock: Failed to listen on socket %s: %s",
+                       sdb_log(SDB_LOG_ERR, "frontend: Failed to listen on socket %s: %s",

                                        listener->address, sdb_strerror(errno, buf, sizeof(buf)));
                        return -1;
                }
                                        listener->address, sdb_strerror(errno, buf, sizeof(buf)));
                        return -1;
                }


@@ -358,7 +359,7 @@ sdb_fe_sock_listen_and_serve(sdb_fe_socket_t *sock, sdb_fe_loop_t *loop)
                        if (errno == EINTR)
                                continue;
 
                        if (errno == EINTR)
                                continue;
 

-                       sdb_log(SDB_LOG_ERR, "sock: Failed to monitor sockets: %s",
+                       sdb_log(SDB_LOG_ERR, "frontend: Failed to monitor sockets: %s",

                                        sdb_strerror(errno, buf, sizeof(buf)));
                        return -1;
                }
                                        sdb_strerror(errno, buf, sizeof(buf)));
                        return -1;
                }


@@ -381,7 +382,7 @@ sdb_fe_sock_listen_and_serve(sdb_fe_socket_t *sock, sdb_fe_loop_t *loop)
 
                                if (conn.fd < 0) {
                                        char buf[1024];
 
                                if (conn.fd < 0) {
                                        char buf[1024];

-                                       sdb_log(SDB_LOG_ERR, "sock: Failed to accept remote "
+                                       sdb_log(SDB_LOG_ERR, "frontend: Failed to accept remote "

                                                        "connection: %s", sdb_strerror(errno,
                                                                buf, sizeof(buf)));
                                        continue;
                                                        "connection: %s", sdb_strerror(errno,
                                                                buf, sizeof(buf)));
                                        continue;


@@ -392,7 +393,7 @@ sdb_fe_sock_listen_and_serve(sdb_fe_socket_t *sock, sdb_fe_loop_t *loop)
                }
        }
 
                }
        }
 

-       sdb_log(SDB_LOG_INFO, "sock: Waiting for connection handler threads "
+       sdb_log(SDB_LOG_INFO, "frontend: Waiting for connection handler threads "

                        "to terminate");
        if (! sdb_channel_shutdown(chan))
                for (i = 0; i < SDB_STATIC_ARRAY_LEN(handler_threads); ++i)
                        "to terminate");
        if (! sdb_channel_shutdown(chan))
                for (i = 0; i < SDB_STATIC_ARRAY_LEN(handler_threads); ++i)