Commit graph

149 commits

Author SHA1 Message Date
JHCD 9b6e5c8da3 some changes in exception-handling 2015-06-29 23:32:55 +02:00
JHCD a1d610ee6a solve issue #30 and #31; change error-handling; test-mode
1.) move bin-path for rtl_fm and multimon-ng to config.ini
2.) check if rtl_fm and multimon-ng started without errors
    both programs don't terminate in case of an error, so we have to
    read the logfile and look into it
3.) now we can't start a instance of BOSWatch without a free SDR-stick
    added -t --test as new argument to skip instantiate of rtl-fm and multimon-ng
4.) change error-handling
2015-06-29 22:31:34 +02:00
JHCD f54debb44e solve bug: rtl-fm and multimon-ng not found (daemon)
the programs are not in the path when you want to start the daemon on systemstart
2015-06-25 19:46:59 +02:00
JHCD 00902784a4 add new argument for logfile-location
-u --usevarlog
Use '/var/log/boswatch' for logfiles instead of subdir 'log' in BOSWatch directory
2015-06-25 17:10:31 +02:00
JHCD f58891a8ec extract class and functions from boswatch.py to includes 2015-06-25 16:13:52 +02:00
JHCD 259239a90b prepare boswatch.py for use as a daemon
1.) We had to change the subprocess calls, don't use shell=True if you want to run as daemon,
you will never be able to kill the sub-sub-processes
2.) implement signal-handler for TERM signal of the daemon-control
2015-06-24 23:26:02 +02:00
JHCD 97e87fcae2 small changes in documentation 2015-06-14 20:21:21 +02:00
JHCD 6eb7318bd0 add debugg-logging for FMS|ZVEI|POC in config.ini 2015-06-14 19:45:03 +02:00
JHCD f1f6503198 new functionality: lookUp description in a given csv-file for FMS, ZVEI and POC
you have the possibility to set a discription for every FMS, ZWEI oder RIC address
descriptions will be imported via csv-files
if enabled BOSWatch will look up the description and could be used in the plugins

eMail-plugin extended wildcards to use describtion %DESC%
2015-06-05 21:49:51 +02:00
JHCD 300675a0e3 move creation of ric-sub as char to poc-decoder 2015-06-05 11:26:01 +02:00
JHCD 2d8c5e4bf5 some small documentation 2015-06-05 10:19:49 +02:00
JHCD 50ce6b2671 fix bug in handling when arg -h/--help is used
Problem: Some unexpected exception are thrown, when arg war -h
Reason: ArgParser throws SystemExit exception when -h is used
Solution: 1.) Move ArgParser to the first position, to prevent create the objects
2.) make sure, the finally block of the main program will not be called
3.) catch SystemExit exception
2015-06-05 10:06:33 +02:00
JHCD 2462596232 fix function freqToHz() for linux 2015-05-31 13:12:37 +02:00
JHCD 0a621b283a a little bit documentation 2015-05-31 12:40:43 +02:00
Schrolli 2e91c3d8c9 insert freqToHz() method in boswatch.py 2015-05-29 11:25:25 +02:00
Schrolli 29a21e1cbb edit boswatch.py File Header 2015-05-28 13:51:20 +02:00
Schrolli 475039c171 little changes 2015-05-28 08:43:08 +02:00
Schrolli 297f27c81c little edit in logging 2015-05-26 07:57:34 +02:00
Schrolli d9b8ae3035 little changes 2015-05-26 07:19:24 +02:00
JHCD 4f79af944d Change logging to TimedRotatingFileHandler
- rotate logfile at midnight
- shutdown/close logfiles at script-end
- small enhancement of the code-documentation
2015-05-25 18:07:44 +02:00
JHCD 9c3c1f5df4 implement FMS in BosMon-plugin 2015-05-24 23:09:38 +02:00
JHCD 1ccc5bb402 enable pro-working 2015-05-24 21:27:50 +02:00
JHCD 72ef930c7f simple filter for pocsag
- implement allow-/deny-list
- move rangefilter

restructure config.ini to follow code-structure
implemented switch to turn on/off regEx-filter
2015-05-24 21:24:26 +02:00
Bastian Schroll 206463f8e9 load filters in boswatch.py 2015-05-23 09:09:13 +02:00
Bastian Schroll ac7965137d set Loglevel of fileHandler in config.ini 2015-05-23 07:48:02 +02:00
Bastian Schroll 0849672cbe rename pluginloader -> pluginLoader 2015-05-22 22:40:44 +02:00
Bastian Schroll 82a837c19e move loadPlugins() pHanlder->pLoader 2015-05-22 21:27:46 +02:00
Bastian Schroll d02a2a3aab little change boswatch, plugin_test includes ready 2015-05-22 20:12:57 +02:00
Bastian Schroll 906c32b683 change empty lines 2015-05-22 18:22:29 +02:00
JHCD edb4db348a path-thrugh frequenz 2015-05-22 17:44:34 +02:00
JHCD eadc4e2ccb change test to prod mode...
delete unused include-path variable
2015-05-22 16:53:05 +02:00
JHCD e67a357d8e (re-)structure code - use include-files now
- move gobals and other stuff to includes
- extract code from boswatch.py to include-files

bugfix in BosMon-plugin
2015-05-22 16:44:23 +02:00
Schrolli 485af2e007 edit loglevel in boswatch.py 2015-05-22 11:44:35 +02:00
Schrolli 1640a49261 edit boswatch.py 2015-05-22 10:14:40 +02:00
Schrolli 247be7f333 little change in pocsag debug msg 2015-05-22 08:32:27 +02:00
Schrolli 736d358e88 edit pocsag (512/1200/2400 support) 2015-05-22 08:27:50 +02:00
Schrolli dc3e45042a little change in error handling 2015-05-21 11:32:21 +02:00
Schrolli 86179f8e11 improve error handling
added a big try:except:else:finally - structure
2015-05-21 11:27:57 +02:00
Schrolli d9f54cd1aa access to args direct with args.OPT 2015-05-21 11:05:21 +02:00
Schrolli 098ac07cfb edit throwAlarm() 2015-05-21 08:57:58 +02:00
Schrolli 848fafa619 insert plugin preload 2015-05-21 08:38:37 +02:00
Bastian Schroll 5a405e1ddb Merge branch 'pr/20' into develop
Conflicts:
	boswatch.py

Merge branch 'pr/20' into develop

Conflicts:
	boswatch.py
2015-05-20 21:39:19 +02:00
JHCD 9000b77349 implement MySQL-plugin 2015-05-20 21:03:58 +02:00
Bastian Schroll 7699856884 activate rtl_fm and multimon 2015-05-20 19:48:46 +02:00
Bastian Schroll 972fc72aab create Logger in Try:Ex: - globals.script_path 2015-05-20 19:28:10 +02:00
Schrolli 1a5c71b4e8 insert usage info in template plugin 2015-05-20 15:20:40 +02:00
Schrolli 76222da522 use globals.config 2015-05-20 14:26:17 +02:00
Schrolli 76ec264046 change directory into main-dev-dir 2015-05-20 13:29:16 +02:00
Bastian Schroll 3134b2d474 HTTP request - seperate url for each function 2015-05-16 18:15:58 +02:00
Bastian Schroll af9aace684 logfiles in false Dir 2015-05-15 21:01:35 +02:00
Bastian Schroll f939041ad4 error in path check 2015-05-15 21:00:14 +02:00
Bastian Schroll 863ba8ae1a check for log dir - make it 2015-05-15 20:55:15 +02:00
Bastian Schroll dcd064c930 format error 2015-05-15 20:54:42 +02:00
Schrolli 15bf6fcb82 edit directory structure 2015-05-08 08:19:32 +02:00
Schrolli 652477df36 another tab problem 2015-05-08 08:14:10 +02:00
Schrolli cc45d539a6 tab problem 2015-05-08 08:13:28 +02:00
Schrolli 4007fcd477 edit for merge 2015-05-08 08:09:24 +02:00
Schrolli 2cd00244d8 Anpassung für merge 2015-05-08 07:56:41 +02:00
Smith-fms e2406e75fa POC1200 updated - error corrected. 2015-05-08 00:27:38 +02:00
Schrolli91 e88fff0a35 Update boswatch.py 2015-05-07 22:04:39 +02:00
Schrolli 745984e45b better error handling, except in clean-up routine 2015-04-28 15:43:47 +02:00
Schrolli 5b70a45f2a pocsag regex validation 2015-04-28 15:40:54 +02:00
Schrolli 475e737a57 little POC changes 2015-04-28 11:29:37 +02:00
Schrolli 7a84eedebf little changes 2015-04-28 11:20:51 +02:00
Schrolli 647f087053 error in config path 2015-04-28 11:10:36 +02:00
Schrolli 59c85eeb09 little change in POC logging 2015-04-28 11:07:31 +02:00
Smith-fms edd6648039 Added rangefilter for POCSAG1200 and POCSAG512 2015-04-27 15:11:09 +02:00
Smith-fms 7dba02be33 added POCSAG512 and POGSAC1200 support 2015-04-27 01:06:29 +02:00
Bastian Schroll 6269a10b99 exit error with args parser 2015-04-19 19:21:35 +02:00
Bastian Schroll 8083339658 litte error in FMS MySQL 2015-04-11 20:49:31 +02:00
Bastian Schroll 84892c09e0 fixed little errors 2015-04-11 20:28:07 +02:00
Bastian Schroll 67103eb0b5 edit FMS validation
the first 8 blocks 0-9 and a-f
2015-04-11 17:10:55 +02:00
Schrolli 6c31238a78 edit FMS validation 2015-04-10 07:46:26 +02:00
Schrolli 57245374ff alls 8 FMS blocks to one 2015-04-10 07:12:48 +02:00
Bastian Schroll 7aa9165ba2 check and log the HTTP response 2015-04-08 21:21:50 +02:00
Schrolli a137e958a0 edit readme 2015-04-08 08:24:02 +02:00
Bastian Schroll f45b4797ac sql connection close in every case 2015-04-07 21:38:17 +02:00
Bastian Schroll c4efc529a9 in case of config file error set std values 2015-04-07 21:36:15 +02:00
Bastian Schroll 40d45538db preload variables 2015-04-07 21:20:48 +02:00
Bastian Schroll 6efb781309 fix sql connection timeout
for every action a new connection are created and closed
2015-04-07 21:18:37 +02:00
Bastian Schroll 36584dce16 change relative to absolute paths 2015-04-07 21:02:56 +02:00
Bastian Schroll 046ae7263b edit some error messages 2015-04-07 20:40:02 +02:00
Bastian Schroll 7cccf66cd4 quiet mode bug
dont show BOSWatch Header text in quiet mode
2015-04-05 19:20:42 +02:00
Bastian Schroll 655c1ee99d added a quit mode
quiet mode (-q/--quiet) without any display output, only Logfiles
2015-04-05 08:11:06 +02:00
Bastian Schroll 3bb87f9782 nicer install.sh
and other little things
2015-04-05 00:54:41 +02:00
Bastian Schroll bd7ce55b39 Logfile and better Error handling
Logfile log_bos.txt
seperate Logfiles for rtl_fm an multimon (log_rtl.txt, log_mon.txt)
better error handling and more log messages
2015-04-05 00:15:32 +02:00
Bastian Schroll 919f04aa74 insert Loglevel
insert the Loglevel:
[INFO] for the display output
[LOG] for a logfile (not now)
[ERROR] for program errors
2015-04-04 23:33:12 +02:00
Bastian Schroll 818309740e added global log function 2015-04-04 22:08:51 +02:00
Bastian Schroll c331d14047 added simple HTTP request
if alarm send a HTTP request to an url you want
2015-04-04 21:47:09 +02:00
Bastian Schroll 7dd61db384 prepared config.ini for module support 2015-04-04 19:21:42 +02:00
Bastian Schroll cfaa8229c6 logo in Script 2015-04-04 16:18:27 +02:00
Bastian Schroll 433e147148 edit FMS validation 2015-04-04 14:03:46 +02:00
Bastian Schroll 90b5de8acd spelling error
ans -> and
2015-04-03 23:11:54 +02:00
Bastian Schroll 9e2922f9dc edit README.md 2015-04-03 22:46:30 +02:00
Bastian Schroll 0ed0bd98eb FMS and ZVEI validation
insert FMS validation
edit ZVEI validation
2015-04-03 22:38:53 +02:00
Bastian Schroll fcc4ba3389 option useMySQL in config.ini
now can set MySQL support in config.ini
useMySQL = (0|1)
2015-04-03 21:43:00 +02:00
Bastian Schroll 7d160dbd43 typing error in BOSWatch description 2015-04-03 16:53:41 +02:00
Bastian Schroll 05f4915a2b First Release 2015-04-03 16:35:34 +02:00
Bastian Schroll 1a293381e7 Initial Commit 2015-04-03 15:55:10 +02:00