Sort out default filters config file location

Change-Id: I8d2c2ca9a491d8fb50bd639f209e46f3edf1eef6
Signed-off-by: Maciej Slodczyk <m.slodczyk2@partner.samsung.com>

diff --git a/configs/dlog-logger.conf.test b/configs/dlog-logger.conf.test
index c858cc2..d68e48e 100644 (file)
--- a/configs/dlog-logger.conf.test
+++ b/configs/dlog-logger.conf.test
@@ -39,4 +39,4 @@ dlog_logger_conf_main=dlogutil -b main -r 1024 -n 1 -f /var/log/dlog/main -v rec
 dlog_logger_conf_radio=dlogutil -b radio -r 256 -n 1 -f /var/log/dlog/radio -v recv_realtime
 dlog_logger_conf_kmsg=dlogutil -b kmsg -r 1024 -n 1 -f /var/log/dlog/kernel -v rwtime
 util_sorting_buffer_size=8192
-dynamic_filters_path=/usr/share/dlog-filters.conf.test
+dynamic_filters_path=/tmp/dlog-filters/

diff --git a/configs/dlog-pipe.conf.test b/configs/dlog-pipe.conf.test
index 2f4b1be..b9c7ce8 100644 (file)
--- a/configs/dlog-pipe.conf.test
+++ b/configs/dlog-pipe.conf.test
@@ -86,4 +86,4 @@ syslog_size=1048576
 
 util_sorting_time_window=5000
 util_sorting_buffer_size=32000
-dynamic_filters_path=/usr/share/dlog-filters.conf.test
+dynamic_filters_path=/tmp/dlog-filters/

diff --git a/configs/dlog-run.conf b/configs/dlog-run.conf
index ebd76f6..ea0b15e 100644 (file)
--- a/configs/dlog-run.conf
+++ b/configs/dlog-run.conf
@@ -1,4 +1,5 @@
 d      /run/dlog       0755    log     log     -       -
+d      /run/dlog/filters.d     0755    log     log     -       -
 d      /run/dlog/priv  0700    log     log     -       -
 t      /run/dlog/priv  0700    log     log     -       security.SMACK64=System
 d      /run/dlog/priv/fifo     0700    log     log     -       -

diff --git a/tests/dlog_test.in b/tests/dlog_test.in
index 075dd72..62338a5 100644 (file)
--- a/tests/dlog_test.in
+++ b/tests/dlog_test.in
@@ -18,6 +18,7 @@ cleanup() {
        [ $MT_TEST  -ne -1 ] && kill $MT_TEST  > /dev/null 2>&1
        [ $LOGGER   -ne -1 ] && kill $LOGGER   > /dev/null 2>&1
        [ -d $TESTDIR ] && rm -rf $TESTDIR/*
+       [ -d $RUNTIME_FILTERS_DIR ] && rm -rf $RUNTIME_FILTERS_DIR
 }
 
 trap cleanup 0
@@ -70,6 +71,10 @@ fi
 export DLOG_CONFIG_PATH="@datadir@/dlog-$type.conf.test"
 PATH=$PATH:@libexecdir@/libdlog/
 
+#create dir for runtime filters
+RUNTIME_FILTERS_DIR="/tmp/dlog-filters/"
+mkdir -p "$RUNTIME_FILTERS_DIR"
+
 # Start the daemon
 if [ $type == "pipe" ]; then
        dlog_logger -b 99 -t 0 &

diff --git a/tests/test_filters.c b/tests/test_filters.c
index 37ea790..42eb769 100644 (file)
--- a/tests/test_filters.c
+++ b/tests/test_filters.c
@@ -17,7 +17,7 @@
 #include <log_filters.h>
 #include <loglimiter.h>
 
-#define FILTERS_CONF "/usr/share/dlog-filters.conf.test/" DYNAMIC_FILTERS_FILENAME
+#define FILTERS_CONF "/tmp/dlog-filters/" DYNAMIC_FILTERS_FILENAME
 #define BUF_LEN (MAX_CONF_KEY_LEN + MAX_CONF_VAL_LEN + 3) // +3 because KEY=VAL\n\0
 
 #define FILTER_ALLOW (__LOG_LIMITER_LIMIT_MAX + 1)