diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html index 3e6ea60..cca8636 100644 --- a/abonapp/templates/abonapp/editAbon.html +++ b/abonapp/templates/abonapp/editAbon.html @@ -212,7 +212,7 @@ {% if abon.statcache.is_today %} {{ abon.statcache.last_time|date:"H:i" }} {% else %} - {{ abon.statcache.last_time|date:"D H:i" }} + {{ abon.statcache.last_time|date:"d b Y H:i D" }} {% endif %}
{% trans 'Octets:' %}
diff --git a/agent/netflow/netflow_collect.sh b/agent/netflow/netflow_collect.sh index 9918507..4ff245c 100755 --- a/agent/netflow/netflow_collect.sh +++ b/agent/netflow/netflow_collect.sh @@ -43,5 +43,5 @@ export LD_LIBRARY_PATH=. flow-cat /tmp/djing_flow/dump/*/*.dmp | ./djing_flow -i ${tmp_ipuser_file} -cl | mysql -u ${mysql_user} -h ${mysql_host} -p -D ${mysql_database} -P ${mysql_port} --password=${mysql_passw} -rm -f tmp_ipuser_file +rm -f ${tmp_ipuser_file} rm -f /tmp/djing_flow/dump/*/*.dmp diff --git a/agent/netflow/start_netflow.sh b/agent/netflow/start_netflow.sh index f6261a7..52e2dbf 100755 --- a/agent/netflow/start_netflow.sh +++ b/agent/netflow/start_netflow.sh @@ -10,7 +10,7 @@ fi port=$1 DIRECTORY=`dirname $(readlink -e "$0")` -tdir="mkdir -p /tmp/djing_flow/${port}" +tdir="/tmp/djing_flow/${port}" if [ -d "${tdir}" ]; then echo "Warning: directory '${tdir}' exists" else