From 20366714f212a1f512e9814865284d836ec8148f Mon Sep 17 00:00:00 2001
From: Dmitry Novikov <nerosketch@gmail.com>
Date: Wed, 17 Apr 2019 18:53:30 +0300
Subject: [PATCH] netflow fix

---
 agent/netflow/netflow_collect.sh | 2 ++
 agent/netflow/netflow_handler.sh | 7 ++++---
 agent/netflow/start_netflow.sh   | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/agent/netflow/netflow_collect.sh b/agent/netflow/netflow_collect.sh
index 4ff245c..14ad712 100755
--- a/agent/netflow/netflow_collect.sh
+++ b/agent/netflow/netflow_collect.sh
@@ -35,6 +35,7 @@ done
 # Сигналим коллекторам чтоб они сбросили дамп в папку /tmp/djing_flow/dump
 for fl in /run/flow.pid.*; do
     kill -HUP `cat ${fl}`
+    sleep 0.1
 done
 sleep 1
 
@@ -45,3 +46,4 @@ flow-cat /tmp/djing_flow/dump/*/*.dmp | ./djing_flow -i ${tmp_ipuser_file} -cl |
 
 rm -f ${tmp_ipuser_file}
 rm -f /tmp/djing_flow/dump/*/*.dmp
+rm -f /tmp/djing_flow/*/ft*
\ No newline at end of file
diff --git a/agent/netflow/netflow_handler.sh b/agent/netflow/netflow_handler.sh
index d2e526a..901eb5f 100755
--- a/agent/netflow/netflow_handler.sh
+++ b/agent/netflow/netflow_handler.sh
@@ -14,11 +14,12 @@ fi
 
 cd "$tmpdir"
 fname=$1
-port=`echo $(find -name "$fname") | tr / "\n" | head -2 | tail -n1`
+abspath=$(find -name "$fname")
+port=`echo "${abspath}" | tr / "\n" | head -2 | tail -n1`
 
 if [[ -z "$port" ]]; then
     echo "$fname not found in any directory"
 else
-    mkdir -p dump/${port}
-    mv ${port}/${fname} dump/${port}/${fname}.dmp
+    mkdir -p ./dump/${port}
+    mv ${abspath} ./dump/${port}/${fname}.dmp
 fi
diff --git a/agent/netflow/start_netflow.sh b/agent/netflow/start_netflow.sh
index 52e2dbf..5d42449 100755
--- a/agent/netflow/start_netflow.sh
+++ b/agent/netflow/start_netflow.sh
@@ -12,7 +12,8 @@ DIRECTORY=`dirname $(readlink -e "$0")`
 
 tdir="/tmp/djing_flow/${port}"
 if [ -d "${tdir}" ]; then
-    echo "Warning: directory '${tdir}' exists"
+    echo "Warning: directory '${tdir}' exists, clean all"
+    rm -f ${tdir}/ft*
 else
     mkdir -p "${tdir}"
 fi