[tokkee]

tokkee.org

Code

projects / sysdb.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Moved core/error to utils/error.
[sysdb.git] / src / backend / mk-livestatus.c
diff --git a/src/backend/mk-livestatus.c b/src/backend/mk-livestatus.c
index adc9cee9188754a913f4244d3db16a23e9d3d27b..bf45da6fdd35df6d3170ed4a4ebafbc1b513b49a 100644 (file)
--- a/src/backend/mk-livestatus.c
+++ b/src/backend/mk-livestatus.c
@@ -52,10 +52,8 @@ sdb_livestatus_get_host(sdb_unixsock_client_t __attribute__((unused)) *client,
                size_t n, sdb_data_t *data,
                sdb_object_t __attribute__((unused)) *user_data)
 {
-       char *hostname = NULL;
-       sdb_time_t timestamp = 0;
-
-       sdb_host_t host = SDB_HOST_INIT;
+       const char *hostname;
+       sdb_time_t timestamp;
 
        int status;
 
@@ -63,27 +61,22 @@ sdb_livestatus_get_host(sdb_unixsock_client_t __attribute__((unused)) *client,
        assert((data[0].type == SDB_TYPE_STRING)
                        && (data[1].type == SDB_TYPE_DATETIME));
 
-       hostname  = strdup(data[0].data.string);
+       hostname  = data[0].data.string;
        timestamp = data[1].data.datetime;
 
-       host.host_name = hostname;
-       host.host_last_update = timestamp;
-
-       status = sdb_store_host(&host);
+       status = sdb_store_host(hostname, timestamp);
 
        if (status < 0) {
                sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to "
-                               "store/update host '%s'.\n", hostname);
-               free(hostname);
+                               "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 = %"PRIscTIME").\n",
+                       "host '%s' (last update timestamp = %"PRIscTIME").",
                        hostname, timestamp);
-       free(hostname);
        return 0;
 } /* sdb_livestatus_get_host */
 
@@ -92,12 +85,10 @@ sdb_livestatus_get_svc(sdb_unixsock_client_t __attribute__((unused)) *client,
                size_t n, sdb_data_t *data,
                sdb_object_t __attribute__((unused)) *user_data)
 {
-       char *hostname = NULL;
-       char *svcname = NULL;
+       const char *hostname = NULL;
+       const char *svcname = NULL;
        sdb_time_t timestamp = 0;
 
-       sdb_service_t svc = SDB_SVC_INIT;
-
        int status;
 
        assert(n == 3);
@@ -105,31 +96,23 @@ sdb_livestatus_get_svc(sdb_unixsock_client_t __attribute__((unused)) *client,
                        && (data[1].type == SDB_TYPE_STRING)
                        && (data[2].type == SDB_TYPE_DATETIME));
 
-       hostname  = strdup(data[0].data.string);
-       svcname   = strdup(data[1].data.string);
+       hostname  = data[0].data.string;
+       svcname   = data[1].data.string;
        timestamp = data[2].data.datetime;
 
-       svc.hostname = hostname;
-       svc.svc_name = svcname;
-       svc.svc_last_update = timestamp;
-
-       status = sdb_store_service(&svc);
+       status = sdb_store_service(hostname, svcname, timestamp);
 
        if (status < 0) {
                sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to "
-                               "store/update service '%s / %s'.\n", hostname, svcname);
-               free(hostname);
-               free(svcname);
+                               "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 = %"PRIscTIME").\n",
+                       "service '%s / %s' (last update timestamp = %"PRIscTIME").",
                        hostname, svcname, timestamp);
-       free(hostname);
-       free(svcname);
        return 0;
 } /* sdb_livestatus_get_svc */
 
@@ -148,13 +131,13 @@ sdb_livestatus_init(sdb_object_t *user_data)
        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.\n",
+                               "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.\n",
+                       "connected to livestatus @ %s.",
                        sdb_unixsock_client_path(client));
        return 0;
 } /* sdb_livestatus_init */
@@ -175,7 +158,7 @@ sdb_livestatus_collect(sdb_object_t *user_data)
                        "Columns: name last_check");
        if (status <= 0) {
                sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to send "
-                               "'GET hosts' command to livestatus @ %s.\n",
+                               "'GET hosts' command to livestatus @ %s.",
                                sdb_unixsock_client_path(client));
                return -1;
        }
@@ -186,7 +169,7 @@ sdb_livestatus_collect(sdb_object_t *user_data)
                                /* 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.\n",
+                               "response from livestatus @ %s while reading hosts.",
                                sdb_unixsock_client_path(client));
                return -1;
        }
@@ -195,7 +178,7 @@ sdb_livestatus_collect(sdb_object_t *user_data)
                        || sdb_unixsock_client_error(client)) {
                char errbuf[1024];
                sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to read "
-                               "host from livestatus @ %s: %s\n",
+                               "host from livestatus @ %s: %s",
                                sdb_unixsock_client_path(client),
                                sdb_strerror(errno, errbuf, sizeof(errbuf)));
                return -1;
@@ -205,7 +188,7 @@ sdb_livestatus_collect(sdb_object_t *user_data)
                        "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.\n",
+                               "'GET services' command to livestatus @ %s.",
                                sdb_unixsock_client_path(client));
                return -1;
        }
@@ -217,7 +200,7 @@ sdb_livestatus_collect(sdb_object_t *user_data)
                                /* 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.\n",
+                               "response from livestatus @ %s while reading services.",
                                sdb_unixsock_client_path(client));
                return -1;
        }
@@ -226,7 +209,7 @@ sdb_livestatus_collect(sdb_object_t *user_data)
                        || sdb_unixsock_client_error(client)) {
                char errbuf[1024];
                sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to read "
-                               "services from livestatus @ %s: %s\n",
+                               "services from livestatus @ %s: %s",
                                sdb_unixsock_client_path(client),
                                sdb_strerror(errno, errbuf, sizeof(errbuf)));
                return -1;
@@ -249,7 +232,7 @@ sdb_livestatus_config_instance(oconfig_item_t *ci)
 
        if (oconfig_get_string(ci, &name)) {
                sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Instance requires "
-                               "a single string argument\n\tUsage: <Instance NAME>\n");
+                               "a single string argument\n\tUsage: <Instance NAME>");
                return -1;
        }
 
@@ -260,13 +243,13 @@ sdb_livestatus_config_instance(oconfig_item_t *ci)
                        oconfig_get_string(child, &socket_path);
                else
                        sdb_log(SDB_LOG_WARNING, "MK Livestatus backend: Ignoring "
-                                       "unknown config option '%s' inside <Instance %s>.\n",
+                                       "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.\n", name);
+                               "missing the 'Socket' option.", name);
                return -1;
        }
 
@@ -277,17 +260,17 @@ sdb_livestatus_config_instance(oconfig_item_t *ci)
        if (! client) {
                char errbuf[1024];
                sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to create "
-                               "unixsock client: %s\n",
+                               "unixsock client: %s",
                                sdb_strerror(errno, errbuf, sizeof(errbuf)));
                return -1;
        }
 
-       user_data = sdb_object_create_wrapper(client,
+       user_data = sdb_object_create_wrapper("unixsock-client", client,
                        (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\n");
+                               "allocate sdb_object_t");
                return -1;
        }
 
@@ -312,7 +295,7 @@ sdb_livestatus_config(oconfig_item_t *ci)
                        sdb_livestatus_config_instance(child);
                else
                        sdb_log(SDB_LOG_WARNING, "MK Livestatus backend: Ignoring "
-                                       "unknown config option '%s'.\n", child->key);
+                                       "unknown config option '%s'.", child->key);
        }
        return 0;
 } /* sdb_livestatus_config */
System DataBase (SysDB)