[Bismark-commits] rev 355 - trunk/server/conf trunk/server/scripts

[walter@svn.comics.unina.it]

Author: walter
Date: 2011-05-27 23:36:30 +0200 (Fri, 27 May 2011)
New Revision: 355

Modified:
   trunk/server/conf/crontab
   trunk/server/scripts/bdm
Log:
massive notification fix

Modified: trunk/server/conf/crontab
===================================================================
--- trunk/server/conf/crontab	2011-05-27 18:10:00 UTC (rev 354)
+++ trunk/server/conf/crontab	2011-05-27 21:36:30 UTC (rev 355)
@@ -1,5 +1,8 @@
+HOME="/home/bismark"
+
 # m h  dom mon dow   command
 
+
 # Mysql remote access
 @reboot               socat TCP4-LISTEN:53306,fork,reuseaddr TCP4:127.0.0.1:3306
 
@@ -18,14 +21,19 @@
 # Bismark data parsers
 10  */2  *   *   *    ~/bin/xml_parse.py > ~/var/log/last_parse.log 2>~/var/log/xml_parse_error.log
 20  */2  *   *   *    ~/bin/t2_parse > ~/var/log/last_t2_parse.log 2>~/var/log/t2_parse_error.log
+15  */2  *   *   *    ~/bin/NB106_t2_parse > ~/var/log/NB106_last_t2_parse.log 2>~/var/log/NB106_t2_parse_error.log
 30  */2  *   *   *    ~/bin/events_parser.py > ~/var/log/event_last_parse.log 2>~/var/log/event_parse_error.log
 35  */2  *   *   *    ~/bin/dhcp_parser.py > ~/var/log/dhcp_last_parse.log 2>~/var/log/dhcp_parse_error.log
 40  */2  *   *   *    ~/bin/arp_parser.py > ~/var/log/arp_last_parse.log 2>~/var/log/arp_parse_error.log
 50  */2  *   *   *    ~/bin/csv_parser_airodump.py > ~/var/log/last_csv_parse.log 2>~/var/log/csv_parse_error.log
 
+# Move old files into device archive
+55  */2  *   *   *    ~/bin/organize-archive.py >/dev/null 2>/dev/null
+
 # Pack every processed file older than 7 days
 30   1   1  *   *     ( /usr/bin/find ~/var/data/old -mtime +7 | /usr/bin/tee -a ~/var/log/old_backup | tar --remove-files -czf ~/var/backup/bkp_$(date +%s).tgz -T /dev/stdin ) >/dev/null 2>/dev/null
 
-# Bismakr monitoring and notifiers
-*/5  *   *   *   *    ~/bin/bdm list notify >/dev/null 2>/dev/null
-0   8,20 *   *   *    ~/bin/device_mon
+# Bismark monitoring and notifiers
+*/5  *   *   *   *    ~/bin/bdm list log >/dev/null 2>/dev/null
+0  10,22 *   *   *    ~/bin/bdm list notify >/dev/null 2>/dev/null
+0   8,20 *   *   *    ~/bin/device_mon >/dev/null 2>/dev/null

Modified: trunk/server/scripts/bdm
===================================================================
--- trunk/server/scripts/bdm	2011-05-27 18:10:00 UTC (rev 354)
+++ trunk/server/scripts/bdm	2011-05-27 21:36:30 UTC (rev 355)
@@ -568,7 +568,7 @@
 		elif [ $off_time -lt 600 ]; then
 			echo -ne $YELLOW
 		else
-			[ "$1" -a $off_time -lt 900 ] && echo "$(date +"%Y-%m-%d %H:%M:%S") - Device $id went offline" >> /tmp/devices.log
+			[ "$1" == log -a $off_time -lt 900 ] && echo "$(date +"%Y-%m-%d %H:%M:%S") - Device $id went offline" >> /tmp/devices.log
 			echo -ne $RED
 		fi
 		# [ $(mysql -NB -u root -e "SELECT deviceid FROM DEVICES WHERE deviceid='$id'" $MYSQL_DB)  ] || printf "#"