From 6049e0e77a0464cff09b4c7a9a531b6f8c25f5fc Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Thu, 9 May 2013 12:57:20 +0200 Subject: db: db ring has precedence over backlog. --- util/db.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'util') diff --git a/util/db.c b/util/db.c index 1e10bfa..3b72007 100644 --- a/util/db.c +++ b/util/db.c @@ -176,9 +176,14 @@ int ulogd_db_configure(struct ulogd_pluginstance *upi, INIT_LLIST_HEAD(&di->backlog); di->backlog_memusage = 0; - + + di->ring.size = ringsize_ce(upi->config_kset).u.value; di->backlog_memcap = backlog_memcap_ce(upi->config_kset).u.value; - if (di->backlog_memcap > 0) { + + if (di->ring.size && di->backlog_memcap) { + ulogd_log(ULOGD_ERROR, "Ring buffer has precedence over backlog\n"); + di->backlog_memcap = 0; + } else if (di->backlog_memcap > 0) { di->backlog_oneshot = backlog_oneshot_ce(upi->config_kset).u.value; if (di->backlog_oneshot <= 2) { ulogd_log(ULOGD_ERROR, @@ -189,9 +194,6 @@ int ulogd_db_configure(struct ulogd_pluginstance *upi, di->backlog_full = 0; } - /* check ring option */ - di->ring.size = ringsize_ce(upi->config_kset).u.value; - return ret; } -- cgit v1.2.3