Commit Graph

153 Commits

Author SHA1 Message Date
Isaac Connor a12030fda7 Handle no storageareas found 2018-01-26 12:54:54 -08:00
Isaac Connor 2f39e44f91 Finish implementing single monitor mod 2018-01-26 15:53:47 -05:00
Isaac Connor 209093a4c6 Improve debug output 2018-01-26 10:32:37 -05:00
Isaac Connor c930a7cce6 fix crash 2018-01-24 15:29:49 -05:00
Isaac Connor 780cff41cf fix regression 2018-01-24 10:08:45 -05:00
Isaac Connor e60a86a061 improve debug output 2018-01-22 15:26:18 -05:00
Isaac Connor 94fc8013c6 use a smarter glob to pick up events that were Deep, when the storage area is now Medium. 2018-01-22 11:10:31 -05:00
Isaac Connor a67c34fcad Allow specifiying storagearea to audit 2018-01-21 17:14:32 -05:00
Isaac Connor 8935b77a12 Add a CTRL-C INT handler as well. Log more info about deleting events 2018-01-19 12:14:36 -05:00
Isaac Connor 4d9f90488f Add a TERM and HUP handler, clean up pid file on term. Add --force command line option to tell zmaudit.pl to continue even if a pid file exists. 2018-01-19 11:40:07 -05:00
Isaac Connor 89ddb8cf5d Fix re for identifying event when using Medium storage scheme 2018-01-10 15:36:36 -05:00
Isaac Connor 224e261ade Don't run audit on default storage area. Add a test for an event having no endtime 2018-01-04 17:16:15 -05:00
Isaac Connor db0e35bf55 Move eventcounts update from zmwatch.pl to triggers and zmaudit.pl 2018-01-04 15:04:13 -05:00
Isaac Connor 7fcbd86ba0 fix auditing Medium directory structures 2017-12-29 15:29:57 -05:00
Isaac Connor d312482a2b add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE 2017-12-18 12:52:26 -05:00
Isaac Connor cd1d2e1721 lots more debugging. re-add status update command on failure 2017-11-22 01:18:07 -05:00
Isaac Connor 489d3ba6ed Merge ../ZoneMinder.master into storageareas 2017-11-21 12:23:17 -05:00
Isaac Connor 95c19fa674 Make zmaudit check for a pid file and not running if it exists 2017-11-20 11:55:42 -05:00
Isaac Connor e27b95c820 make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace 2017-10-27 08:05:35 -07:00
Isaac Connor 7f50a13074 add Event disk space recalc to zmaudit 2017-10-10 12:11:59 -07:00
Isaac Connor 9ad29f4baf fix and move pod to bottom 2017-09-11 22:19:49 -04:00
Isaac Connor 0c24556611 fix missing ! 2017-08-24 10:59:56 -04:00
Isaac Connor 6e24eb6462 use find_one ins tead of New when loading event to determine if event still exists in db 2017-08-18 09:28:14 -04:00
Isaac Connor 85202a0bfd add test for when an event is deleted during audit 2017-08-15 13:06:59 -04:00
Isaac Connor 1f8871639a only complain about losing the dbh connection, if we can't reconnect 2017-07-27 09:56:07 -04:00
Isaac Connor 451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor 9c9eaa6851 move test for MIN_AGE up. Don't need to constantly check for it because it won't change. 2017-06-02 12:35:01 -04:00
Isaac Connor 8b91403c25 remove references to Storage object 2017-06-02 12:32:02 -04:00
Isaac Connor 36ccc5b7b6 Merge bits from SA. Mostly double to single quotes plus some debug lines when errors happen 2017-05-31 09:33:51 -04:00
Isaac Connor f4224bb88e Merge branch 'master' into storageareas 2017-05-17 17:47:39 -04:00
Isaac Connor 6ffe8018ef fixup spacing/braces 2017-05-17 11:52:25 -04:00
Isaac Connor c80c02ea00 move the reconnect to db logic after the continuous sleep, so that we reconnect after long sleep 2017-04-19 12:46:44 -04:00
Isaac Connor ed04c44ad0 comment out delete_empty_directories. It is too intensive 2017-04-07 13:21:33 -04:00
Isaac Connor 8bb9ba7bea Add more debugging 2017-03-29 09:59:58 -04:00
Isaac Connor 56acea30fe implement a command line option to limit the monitor to which zmaudit is doing it's job 2017-03-23 19:54:16 -04:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor ed618ff7b0 Merge branch 'master' into storageareas 2016-12-20 11:29:31 -05:00
Isaac Connor 8009bce3d9 quote the link name so that spaces don't break it 2016-12-13 13:23:20 -05:00
Isaac Connor f40c8d0da8 contains due to glob 2016-09-20 15:54:37 -04:00
Isaac Connor 5fb1c45c4e Merge ../ZoneMinder.connortechnology into storageareas 2016-09-08 11:34:36 -04:00
Isaac Connor 7b0a14ee72 change doulbe quotes to single quotes. Detect if we can't chdir into the monitor dir. 2016-09-08 11:06:02 -04:00
Isaac Connor e51cc7efc8 add a missing / in error message 2016-08-31 11:21:46 -04:00
Isaac Connor 99289e4713 Deprecate MAX_AGED_DIRS. Only check age if the fs event isn't in the db. This should work much better. 2016-08-04 12:22:33 -04:00
Isaac Connor 1e2ec7028e better debugging. add back deleting of zmswap files. detaint them so that they can be deleted. Use Objects to fix up deleting events 2016-07-12 14:16:20 -04:00
Isaac Connor 26369268bb merge Steve's updates, work on zmaudit 2016-07-12 11:27:25 -04:00
Isaac Connor c0cb1419a3 fixup delete_empty_directories 2016-06-07 22:03:46 -04:00
Isaac Connor eb4e36789d maybe fix delete_empty_directories 2016-06-07 21:43:47 -04:00
Isaac Connor 5ff53ebce0 More output on errors, make them non-fatal 2016-06-07 21:37:33 -04:00
Isaac Connor b081d2e3bf rename fs_monitor to monitor_id, which is what it is 2016-06-06 10:30:52 -04:00
Isaac Connor 5f83bac59c add line to delete empty directories 2016-06-03 12:01:31 -04:00
Isaac Connor ad185809f8 Merge branch 'fix_zmaudit' into storageareas 2016-06-03 11:57:38 -04:00
Isaac Connor 575180ba5e introduce new function that recursively deletes empty directories. Call it on each monitor dir 2016-06-03 11:35:28 -04:00
Isaac Connor b8cf7c04c1 Fix messed up SQL. die when the selectFrameData sql doesn't execute 2016-05-31 09:14:50 -04:00
Isaac Connor 1e52934dcf Implement a time function that gets unix_timestamp from StartTime, and implement check_for_files_in_filessytem 2016-05-20 20:33:47 -04:00
Isaac Connor 56e0e4e3c6 Use Event->getPath instead of something wrong 2016-05-10 09:07:09 -04:00
Isaac Connor e52e880553 rework open event check to not use group by 2016-04-20 10:00:13 -04:00
Isaac Connor bb15915ce5 Use EventPrefix, not Prefix 2016-04-19 15:23:36 -04:00
Isaac Connor 588dbc0c3c Don't JOIN MOnitors to get event prefix. Use {->MonitorID} instead 2016-04-19 15:22:46 -04:00
Isaac Connor d9646d6ceb Populate a Monitors hash with the Monitors data so we don't have to use in JOINs later 2016-04-19 15:19:37 -04:00
Isaac Connor 3a8352eb6b Merge branch 'master' into storageareas 2016-03-21 10:25:03 -04:00
Kyle Johnson b9085cea64 Fix issue where programs are installed in unexpected paths.
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
2016-03-11 14:28:16 -07:00
Isaac Connor f1831383da add a check for valid event link. Ignore anything that doesn't look right 2016-01-08 10:36:38 -05:00
Isaac Connor 455f6d5b7b have to use ->Path() as {Path} might not be filled in 2016-01-04 15:57:35 -05:00
Isaac Connor 6e685ec8c8 add Monitor object class and use it in zmaudit.pl to print out path where monitor should have been 2016-01-04 15:13:01 -05:00
Isaac Connor f04ba9c87e linefeed when saying that a db monitor doesn't exist in fs 2016-01-04 15:05:49 -05:00
Isaac Connor fb7b171d6e fix merge 2016-01-04 14:37:23 -05:00
Isaac Connor b1205bcaa9 Merge branch 'multi-server' into storageareas
Conflicts:
	CMakeLists.txt
	configure.ac
	scripts/zmaudit.pl.in
	version
2016-01-02 14:45:24 -05:00
Isaac Connor 6537b61c36 put Storage Path in prompt when filesystem monitor doesn't exist in db 2015-12-30 08:08:01 -05:00
Isaac Connor 07af49511c Load Storage Object so that we can print it's path 2015-12-24 15:33:46 -05:00
Isaac Connor 92ddd57942 include storage path when saying an event is too young to delete 2015-12-24 15:28:36 -05:00
Isaac Connor ec0d6359a0 Merge branch 'newpointone' of isaac.internal.point-one.com:ZoneMinder.p1 into newpointone 2015-12-24 15:26:24 -05:00
Isaac Connor 177ed076a7 Make zmaudit only look at storage areas that are local 2015-12-24 15:25:56 -05:00
Isaac Connor 492550b5ef Merge branch 'storageareas' into newpointone
Conflicts:
	scripts/zmaudit.pl.in
2015-12-24 12:36:40 -05:00
Isaac Connor c174d74987 Set MOnitorId and StorageID because the Event does not exist in the db 2015-12-24 12:36:16 -05:00
Isaac Connor ac0425d14b sort events before testing and deleting. Makes the output easier to grok 2015-12-22 15:08:38 -05:00
Isaac Connor 12a5621fb8 remove deleted event from fs_events hash so that we don't do it more than once 2015-12-22 14:31:24 -05:00
Isaac Connor 39bcb20dac Skip directories that have non-digits in them 2015-12-22 12:59:37 -05:00
Isaac Connor 9ad22d9ee5 have to set the MonitorId on events that don't exist in db 2015-12-22 12:55:55 -05:00
Isaac Connor bc4ce4f009 add Event require and document lgob behaviour and skip monitor dirs that have anything other than digits in them 2015-12-22 12:35:25 -05:00
Isaac Connor 06a5a6d879 rough in Storage area support 2015-12-22 11:50:29 -05:00
Isaac Connor 4a506368dc Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field 2015-10-06 09:30:10 -04:00
Isaac Connor 8eb5e53aad Remove with {ZM_PATH_SWAP} 2015-05-14 10:27:11 -04:00
Isaac Connor 3709ac411d Not having ZM_AUDIT_MIN_AGE should be fatal 2015-05-13 12:36:35 -04:00
Isaac Connor 950cd06535 Revert "Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting""
This reverts commit 9c73b7247c.
2015-05-13 11:38:55 -04:00
Isaac Connor 9c73b7247c Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting"
This reverts commit a5fed03524.
2015-05-13 11:37:13 -04:00
Isaac Connor a5fed03524 Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting 2015-05-13 11:33:22 -04:00
Dmitry Smirnov 4bb8043fe5 zmaudit.pl: PBP/5 + readability 2015-04-10 20:34:17 +10:00
Dmitry Smirnov aeb3486322 zmaudit.pl: convert to pod2usage 2015-04-10 20:34:17 +10:00
Isaac Connor 20fec3ed7a According perldoc DBI we should NOT be calling finish after processing all rows. 2015-02-04 11:15:31 -05:00
Isaac Connor 71c94475ff Add -v --version command line parameters to zmaudit.pl 2015-01-06 21:08:41 -05:00
Isaac Connor 9eb88d3f15 add a check for db connection to handle the db going away and coming back 2014-10-15 09:43:00 -04:00
Isaac Connor 48a6dcf5ce Change COnfig from using the subroutine symbol table to just using a global hash 2013-12-16 16:32:02 -05:00
stan f74f893651 Added low_priority qualifier to some audit statements to avoid pre-empting more important operations.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3508 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 09:51:13 +00:00
stan b7ca4dba77 Fixed a few more incorrectly quoted split patterns, though these were not disfunctional.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3505 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 07:51:36 +00:00
stan 9f6c9fe0dc Detect and clean broken event links
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3472 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-28 11:05:03 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 4121d5f5de Restructured slightly to workmore efficiently and require fewer passes for full cleanups. Also added tests for hanging monitor symbolic links and events left behind when monitors are removed.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3327 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 13:01:45 +00:00
stan 331c6ca9cc Fixed typo in audit script
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3064 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-05-27 12:17:53 +00:00
stan 3428fc48f5 Updated EVENT_PATH for absolute event paths
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3041 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 22:03:27 +00:00