From 22e601912ec907d107e4b85e96ba3c4ef5d2e049 Mon Sep 17 00:00:00 2001
From: Timofey Titovets <nefelim4ag@gmail.com>
Date: Fri, 30 Dec 2016 04:26:42 +0300
Subject: [PATCH] Make filters configurable

Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>
---
 scripts/beesd             | 31 +++++++++++++++++++++++--------
 scripts/beesd.conf.sample |  6 ++++++
 2 files changed, 29 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 scripts/beesd

diff --git a/scripts/beesd b/scripts/beesd
old mode 100644
new mode 100755
index 8342e29..6abffc4
--- a/scripts/beesd
+++ b/scripts/beesd
@@ -50,6 +50,7 @@ BEESHOME="${BEESHOME:-$MNT_DIR/.beeshome}"
 BEESSTATUS="${BEESSTATUS:-$WORK_DIR/$UUID.status}"
 DB_SIZE="${DB_SIZE:-$((64*AL16M))}"
 LOG_SHORT_PATH="${LOG_SHORT_PATH:-N}"
+LOG_FILTER_TIME="${LOG_FILTER_TIME:-N}"
 
 INFO "Check: BTRFS UUID exists"
 if [ ! -d "/sys/fs/btrfs/$UUID" ]; then
@@ -97,15 +98,29 @@ fi
     chmod 700 "$DB_PATH"
 }
 
-filter_output(){
-     sed -e 's/^.*crawl:/crawl:/g' \
-         -e 's/^.*status:/status:/g' \
-         -e 's/^.*bees:/bees:/g' \
-         -e 's/^.*crawl_writeback:/crawl_writeback:/g' \
-         -e 's/^.*main:/main:/g' \
-         -e 's/^.*hash_prefetch:/hash_prefetch:/g'
+MNT_DIR="${MNT_DIR//\/\//\/}"
+
+filter_time(){
+    if YN $LOG_FILTER_TIME; then
+        sed -e 's/^.*crawl:/crawl:/g' \
+            -e 's/^.*status:/status:/g' \
+            -e 's/^.*bees:/bees:/g' \
+            -e 's/^.*crawl_writeback:/crawl_writeback:/g' \
+            -e 's/^.*main:/main:/g' \
+            -e 's/^.*hash_prefetch:/hash_prefetch:/g'
+    else
+        cat
+    fi
 }
 
-bees "$MNT_DIR" 3>&1 2>&1 | filter_output
+filter_path(){
+    if YN $LOG_SHORT_PATH; then
+        sed -e "s#$MNT_DIR##g"
+    else
+        cat
+    fi
+}
+
+bees "$MNT_DIR" 3>&1 2>&1 | filter_time | filter_path
 
 exit 0
diff --git a/scripts/beesd.conf.sample b/scripts/beesd.conf.sample
index 29bdda4..7245c1b 100644
--- a/scripts/beesd.conf.sample
+++ b/scripts/beesd.conf.sample
@@ -12,6 +12,12 @@ UUID=5d3c0ad5-bedf-463d-8235-b4d4f6f99476
 # BEESHOME="$MNT_DIR/.beeshome"
 # BEESSTATUS="$WORK_DIR/$UUID.status"
 
+## Make path shorter in logs
+# LOG_SHORT_PATH=N
+
+## Remove timestamp from bees output
+# LOG_FILTER_TIME=N
+
 ## Bees DB size
 # Hash Table Sizing
 # sHash table entries are 16 bytes each