![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sebastian Harl <sh@tokkee.org> | |
| Fri, 27 Jun 2014 16:08:29 +0000 (18:08 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Fri, 27 Jun 2014 16:08:29 +0000 (18:08 +0200) |
diff --git a/src/Makefile.am b/src/Makefile.am
index ed3ebdad700445caca0ec8b95d661ecee848a658..d851492580b9d4620b272e2a76d96254a8936cf4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
endif
sysdbd_SOURCES = tools/sysdbd/main.c include/sysdb.h \
- tools/sysdbd/configfile.c tools/sysdbd/configfile.h
+ tools/sysdbd/configfile.c tools/sysdbd/configfile.h \
+ $(libsysdb_la_SOURCES)
sysdbd_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
-sysdbd_LDFLAGS = -export-dynamic
-sysdbd_LDADD = libsysdb.la liboconfig/liboconfig.la
-sysdbd_DEPENDENCIES = liboconfig/liboconfig.la
+sysdbd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+sysdbd_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -pthread
+sysdbd_LDADD = libsysdb_fe_parser.la liboconfig/liboconfig.la \
+ $(LIBLTDL) -lrt
+sysdbd_DEPENDENCIES = libsysdb_fe_parser.la liboconfig/liboconfig.la
+
+if BUILD_WITH_LIBDBI
+sysdbd_LDADD += -ldbi
+endif
sdbconfdir = $(sysconfdir)/sysdb
dist_sdbconf_DATA = tools/sysdbd/sysdbd.conf.sample
pkgcnamelib_LTLIBRARIES += plugins/cname/dns.la
plugins_cname_dns_la_SOURCE = plugins/cname/dns.c
plugins_cname_dns_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-libsysdb_la_LIBADD += -dlopen plugins/cname/dns.la
-libsysdb_la_DEPENDENCIES += plugins/cname/dns.la
+sysdbd_LDADD += -dlopen plugins/cname/dns.la
+sysdbd_DEPENDENCIES += plugins/cname/dns.la
endif
if BUILD_PLUGIN_COLLECTD
pkgbackendcollectdlib_LTLIBRARIES += backend/collectd/unixsock.la
backend_collectd_unixsock_la_SOURCES = backend/collectd/unixsock.c
backend_collectd_unixsock_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-libsysdb_la_LIBADD += -dlopen backend/collectd/unixsock.la
-libsysdb_la_DEPENDENCIES += backend/collectd/unixsock.la
+sysdbd_LDADD += -dlopen backend/collectd/unixsock.la
+sysdbd_DEPENDENCIES += backend/collectd/unixsock.la
endif
if BUILD_PLUGIN_MKLIVESTATUS
pkgbackendlib_LTLIBRARIES += backend/mk-livestatus.la
backend_mk_livestatus_la_SOURCES = backend/mk-livestatus.c
backend_mk_livestatus_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-libsysdb_la_LIBADD += -dlopen backend/mk-livestatus.la
-libsysdb_la_DEPENDENCIES += backend/mk-livestatus.la
+sysdbd_LDADD += -dlopen backend/mk-livestatus.la
+sysdbd_DEPENDENCIES += backend/mk-livestatus.la
endif
if BUILD_PLUGIN_PUPPETSTORECONFIGS
pkgbackendpuppetlib_LTLIBRARIES += backend/puppet/store-configs.la
backend_puppet_store_configs_la_SOURCES = backend/puppet/store-configs.c
backend_puppet_store_configs_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-libsysdb_la_LIBADD += -dlopen backend/puppet/store-configs.la
-libsysdb_la_DEPENDENCIES += backend/puppet/store-configs.la
+sysdbd_LDADD += -dlopen backend/puppet/store-configs.la
+sysdbd_DEPENDENCIES += backend/puppet/store-configs.la
endif
if BUILD_PLUGIN_SYSLOG
pkglib_LTLIBRARIES += plugins/syslog.la
plugins_syslog_la_SOURCE = plugins/syslog.c
plugins_syslog_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-libsysdb_la_LIBADD += -dlopen plugins/syslog.la
-libsysdb_la_DEPENDENCIES += plugins/syslog.la
+sysdbd_LDADD += -dlopen plugins/syslog.la
+sysdbd_DEPENDENCIES += plugins/syslog.la
endif
include/client/sysdb.h: include/client/sysdb.h.in ../version
diff --git a/src/client/sock.c b/src/client/sock.c
index 805dc1d1ce5350da8d1aaced43d9bce53df1d9cd..b60bad45e2cf97d47d2c101513c030f4a27fff5e 100644 (file)
--- a/src/client/sock.c
+++ b/src/client/sock.c
return client->fd;
} /* sdb_client_sockfd */
+int
+sdb_client_shutdown(sdb_client_t *client, int how)
+{
+ if (! client) {
+ errno = ENOTSOCK;
+ return -1;
+ }
+
+ if (client->fd < 0) {
+ errno = EBADF;
+ return -1;
+ }
+
+ return shutdown(client->fd, how);
+} /* sdb_client_shutdown */
+
void
sdb_client_close(sdb_client_t *client)
{
diff --git a/src/core/plugin.c b/src/core/plugin.c
index 8cd490a22a7da2f39e946f4d06be445fda1ebba7..b3d5973178dffed19411af5d5acea45a99b718e3 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
sdb_llist_iter_t *iter;
int ret = -1;
+ _Bool logged = 0;
+
if (! msg)
return 0;
- if (! sdb_llist_len(log_list))
- return fprintf(stderr, "[%s] %s\n", SDB_LOG_PRIO_TO_STRING(prio), msg);
-
iter = sdb_llist_get_iter(log_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_log_cb callback;
tmp = callback(prio, msg, SDB_PLUGIN_CB(obj)->cb_user_data);
if (tmp > ret)
ret = tmp;
+
+ if (SDB_PLUGIN_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);
return ret;
} /* sdb_plugin_log */
index 49ddaf547465f349b8ba57aede974e0388628652..e501b2cd830169b2b7de01660207c976ca66f089 100644 (file)
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
typedef struct {
sdb_store_base_t super;
- sdb_llist_t *children;
+ sdb_llist_t *services;
sdb_llist_t *attributes;
} sdb_store_obj_t;
#define SDB_STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
typedef struct {
sdb_store_matcher_t super;
char *name;
- /* XXX: this needs to be more flexible;
- * add support for type-specific operators */
string_matcher_t value;
} attr_matcher_t;
#define ATTR_M(m) ((attr_matcher_t *)(m))
diff --git a/src/core/store.c b/src/core/store.c
index df8c02fb152a87135c4f44464476d8d8096d5361..bb37e26a7d9e074466f70d724a8943acabd03747 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
* private variables
*/
-static sdb_llist_t *obj_list = NULL;
+static sdb_llist_t *host_list = NULL;
static pthread_rwlock_t obj_lock = PTHREAD_RWLOCK_INITIALIZER;
/*
if (ret)
return ret;
- sobj->children = sdb_llist_create();
- if (! sobj->children)
+ sobj->services = sdb_llist_create();
+ if (! sobj->services)
return -1;
sobj->attributes = sdb_llist_create();
if (! sobj->attributes)
store_base_destroy(obj);
- if (sobj->children)
- sdb_llist_destroy(sobj->children);
+ if (sobj->services)
+ sdb_llist_destroy(sobj->services);
if (sobj->attributes)
sdb_llist_destroy(sobj->attributes);
} /* sdb_store_obj_destroy */
*/
static sdb_store_obj_t *
-store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
+lookup_host(const char *name)
{
- sdb_llist_iter_t *iter;
-
- if (! l)
- return NULL;
-
- iter = sdb_llist_get_iter(l);
- if (! iter)
- return NULL;
-
- while (sdb_llist_iter_has_next(iter)) {
- sdb_store_obj_t *sobj = SDB_STORE_OBJ(sdb_llist_iter_get_next(iter));
- assert(sobj);
-
- if ((STORE_BASE(sobj)->type == type)
- && (! strcasecmp(SDB_OBJ(sobj)->name, name))) {
- sdb_llist_iter_destroy(iter);
- return sobj;
- }
-
- /* don't lookups non-host types from hierarchical hosts */
- if ((type != SDB_HOST) && (STORE_BASE(sobj)->type == SDB_HOST))
- continue;
-
- sobj = store_lookup_in_list(sobj->children, type, name);
- if (sobj) {
- sdb_llist_iter_destroy(iter);
- return sobj;
- }
- }
- sdb_llist_iter_destroy(iter);
- return NULL;
-} /* store_lookup_in_list */
-
-static sdb_store_obj_t *
-store_lookup(int type, const char *name)
-{
- return store_lookup_in_list(obj_list, type, name);
-} /* store_lookup */
+ return SDB_STORE_OBJ(sdb_llist_search_by_name(host_list, name));
+} /* lookup_host */
/* The obj_lock has to be acquired before calling this function. */
static int
-store_obj(int parent_type, const char *parent_name,
- int type, const char *name, sdb_time_t last_update,
- sdb_store_base_t **updated_obj)
+store_obj(const char *hostname, int type, const char *name,
+ sdb_time_t last_update, sdb_store_base_t **updated_obj)
{
- char *parent_cname = NULL, *cname = NULL;
+ char *host_cname = NULL, *cname = NULL;
sdb_llist_t *parent_list;
sdb_store_base_t *old;
if (last_update <= 0)
last_update = sdb_gettime();
- assert((parent_type == 0)
- || (parent_type == SDB_HOST)
- || (parent_type == SDB_SERVICE));
assert((type == 0)
|| (type == SDB_HOST)
|| (type == SDB_SERVICE)
|| (type == SDB_ATTRIBUTE));
- if (parent_type == SDB_HOST) {
- parent_cname = sdb_plugin_cname(strdup(parent_name));
- if (! parent_cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ assert(hostname || (type == SDB_HOST));
+ assert((! hostname)
+ || (type == SDB_SERVICE)
+ || (type == SDB_ATTRIBUTE));
+
+ if (! host_list)
+ if (! (host_list = sdb_llist_create()))
return -1;
- }
- parent_name = parent_cname;
- }
+ parent_list = host_list;
+
if (type == SDB_HOST) {
cname = sdb_plugin_cname(strdup(name));
if (! cname) {
name = cname;
}
- if (! obj_list) {
- if (! (obj_list = sdb_llist_create())) {
- free(parent_cname);
+ if (hostname) {
+ sdb_store_obj_t *host;
+
+ host_cname = sdb_plugin_cname(strdup(hostname));
+ if (! host_cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
free(cname);
return -1;
}
- }
- parent_list = obj_list;
+ hostname = host_cname;
- if (parent_type && parent_name) {
- sdb_store_obj_t *parent;
-
- parent = store_lookup(parent_type, parent_name);
- if (! parent) {
+ host = lookup_host(hostname);
+ if (! host) {
sdb_log(SDB_LOG_ERR, "store: Failed to store %s '%s' - "
- "parent %s '%s' not found", SDB_STORE_TYPE_TO_NAME(type),
- name, SDB_STORE_TYPE_TO_NAME(parent_type), parent_name);
- free(parent_cname);
+ "host '%s' not found", SDB_STORE_TYPE_TO_NAME(type),
+ name, hostname);
+ free(host_cname);
free(cname);
return -1;
}
if (type == SDB_ATTRIBUTE)
- parent_list = parent->attributes;
+ parent_list = host->attributes;
else
- parent_list = parent->children;
+ parent_list = host->services;
}
if (type == SDB_HOST)
- /* make sure that each host is unique */
- old = STORE_BASE(store_lookup_in_list(obj_list, type, name));
- else if (type == SDB_ATTRIBUTE)
- /* look into attributes of this host */
- old = STORE_BASE(sdb_llist_search_by_name(parent_list, name));
+ old = STORE_BASE(sdb_llist_search_by_name(host_list, name));
else
- /* look into services assigned to this host (store_lookup_in_list
- * does not look up services from hierarchical hosts) */
- old = STORE_BASE(store_lookup_in_list(parent_list, type, name));
+ old = STORE_BASE(sdb_llist_search_by_name(parent_list, name));
if (old) {
if (old->last_update > last_update) {
sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
SDB_STORE_TYPE_TO_NAME(type), name,
sdb_strerror(errno, errbuf, sizeof(errbuf)));
- free(parent_cname);
+ free(host_cname);
free(cname);
return -1;
}
- /* TODO: insert type-aware; the current version works as long as we
- * don't support to store hierarchical data */
status = sdb_llist_insert_sorted(parent_list, SDB_OBJ(new),
sdb_object_cmp_by_name);
if (updated_obj)
*updated_obj = new;
}
- free(parent_cname);
+ free(host_cname);
free(cname);
return status;
} /* store_obj */
void
sdb_store_clear(void)
{
- sdb_llist_destroy(obj_list);
- obj_list = NULL;
+ sdb_llist_destroy(host_list);
+ host_list = NULL;
} /* sdb_store_clear */
int
return -1;
pthread_rwlock_wrlock(&obj_lock);
- status = store_obj(/* parent = */ 0, NULL,
+ status = store_obj(/* hostname = */ NULL,
/* stored object = */ SDB_HOST, name, last_update,
/* updated_obj = */ NULL);
pthread_rwlock_unlock(&obj_lock);
if (! name)
return NULL;
- host = store_lookup(SDB_HOST, name);
+ host = lookup_host(name);
return host != NULL;
} /* sdb_store_has_host */
if (! name)
return NULL;
- host = store_lookup(SDB_HOST, name);
+ host = lookup_host(name);
if (! host)
return NULL;
return -1;
pthread_rwlock_wrlock(&obj_lock);
- status = store_obj(/* parent = */ SDB_HOST, hostname,
+ status = store_obj(hostname,
/* stored object = */ SDB_ATTRIBUTE, key, last_update,
&updated_attr);
return -1;
pthread_rwlock_wrlock(&obj_lock);
- status = store_obj(/* parent = */ SDB_HOST, hostname,
+ status = store_obj(hostname,
/* stored object = */ SDB_SERVICE, name, last_update,
/* updated obj = */ NULL);
pthread_rwlock_unlock(&obj_lock);
if (! (flags & SDB_SKIP_SERVICES)) {
sdb_strbuf_append(buf, ", \"services\": ");
- store_obj_tojson(host->children, SDB_SERVICE, buf);
+ store_obj_tojson(host->services, SDB_SERVICE, buf);
}
sdb_strbuf_append(buf, "}");
pthread_rwlock_rdlock(&obj_lock);
- host_iter = sdb_llist_get_iter(obj_list);
+ host_iter = sdb_llist_get_iter(host_list);
if (! host_iter) {
pthread_rwlock_unlock(&obj_lock);
return -1;
pthread_rwlock_rdlock(&obj_lock);
- host_iter = sdb_llist_get_iter(obj_list);
+ host_iter = sdb_llist_get_iter(host_list);
if (! host_iter)
status = -1;
index 3920b80127c5a228792b299e06bc5e6e51f1187b..f57cb05cab292fa53d86b56c936d35403fc77351 100644 (file)
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
return match_string(&NAME_M(m)->name, obj->super.name);
break;
case SDB_SERVICE:
- iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->children);
+ iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->services);
break;
case SDB_ATTRIBUTE:
iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->attributes);
index bce3da91898a670a00eb532e630e2b0663462321..aeed8a253b58f310c4e3e55df13e38f4bfa0232b 100644 (file)
int
sdb_client_sockfd(sdb_client_t *client);
+/*
+ * sdb_client_shutdown:
+ * Shut down the client's send and/or receive operations.
+ * See shutdown(3) for details.
+ */
+int
+sdb_client_shutdown(sdb_client_t *client, int how);
+
/*
* sdb_client_close:
* Close the client connection.
diff --git a/src/tools/sysdb/main.c b/src/tools/sysdb/main.c
index 05c5b9fb6d6ce6f6d57cb45f04666dff37e775a7..fc226f965f991ec65f4cc4bbfa5b61f7ba318e57 100644 (file)
--- a/src/tools/sysdb/main.c
+++ b/src/tools/sysdb/main.c
sdb_input_init(&input);
sdb_input_mainloop();
+ sdb_client_shutdown(input.client, SHUT_WR);
+ while (! sdb_client_eof(input.client)) {
+ /* wait for remaining data to arrive */
+ sdb_command_print_reply(input.client);
+ }
+
if (hist_file[0] != '\0') {
errno = 0;
if (write_history(hist_file)) {