diff options
author | Eric Leblond <eric@regit.org> | 2013-05-09 12:57:20 +0200 |
---|---|---|
committer | Eric Leblond <eric@regit.org> | 2013-05-21 19:57:07 +0200 |
commit | 6049e0e77a0464cff09b4c7a9a531b6f8c25f5fc (patch) | |
tree | 958da8a6b2c60dddec5bde7203732d38b3c87113 /util/db.c | |
parent | c6bfadfdf8aef2dc84eabade6b4198fec7b00b44 (diff) |
db: db ring has precedence over backlog.
Diffstat (limited to 'util/db.c')
-rw-r--r-- | util/db.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -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; } |