ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,608 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

1635 Commits

Author SHA1 Message Date
Isaac Connor 6883159ad0 Use a LEFT JOIN on Storage WHEN Running Filters 2018-01-24 12:15:35 -05:00
Isaac Connor 71263c525b :Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
 2018-01-24 11:55:32 -05:00
Isaac Connor 215660a817 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_packetqueue.cpp
	src/zm_videostore.cpp
	src/zm_videostore.h
	web/includes/Event.php
	web/skins/classic/views/events.php
 2018-01-24 11:06:19 -05:00
Isaac Connor cf4ac74d02 If failed to delete from Frames or Stats, return instead of deleting the event. 2018-01-24 10:45:42 -05:00
Isaac 83371d0f21 Fix Error => Debug 2018-01-23 17:42:57 +01:00
Isaac Connor e60a86a061 improve debug output 2018-01-22 15:26:18 -05:00
Isaac Connor 37ff7c3779 Add finding by Id to Event 2018-01-22 15:26:01 -05:00
Isaac Connor 2068a5c684 Add object caching 2018-01-22 15:25:51 -05:00
Isaac Connor d63594b5fa don't do updates in a transaction so we don't hold locks 2018-01-22 14:06:52 -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 b317748796 Add Server loading 2018-01-22 11:09:49 -05:00
Isaac Connor 493a2386c4 Only load Time from StartTime if it has a value. Parse Path to get LInkPath if no Time. 2018-01-22 11:09:35 -05:00
Isaac 63351b5494 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-21 23:18:45 +01:00
Isaac Connor a67c34fcad Allow specifiying storagearea to audit 2018-01-21 17:14:32 -05:00
Isaac c5332a255b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-21 21:11:28 +01:00
Isaac fedd67a7f6 add to_string 2018-01-21 21:11:05 +01:00
Isaac Connor f0d4cab24a Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	web/ajax/add_monitors.php
 2018-01-21 11:13:06 -05:00
Isaac Connor 6d46a02a9a DbReconnect if the db connection goes down 2018-01-19 18:25:24 -05:00
Isaac Connor 43d72decac Turn off extra debugging 2018-01-19 18:24:59 -05:00
Isaac Connor 2682686063 Must disconnect and reconnect before calling update script 2018-01-19 16:32:26 -05:00
Isaac Connor dfce773341 We should return the value of DiskSpace 2018-01-19 13:32:28 -05:00
Isaac 62704601ca We should return the value of DIskSpace 2018-01-19 19:22:43 +01:00
Isaac Connor e8603b6065 Use coalesce to handle NULLs 2018-01-19 13:08:13 -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 17a29f7e83 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-19 11:40:14 -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 9fb1074875 add auto-scheme detection from path. Fix de-tainting in delete_files 2018-01-19 11:39:31 -05:00
Isaac Connor 3749eb3e6f Only send kill once. No point in repeating it 2018-01-19 08:19:10 -08:00
Isaac Connor e37d27e972 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_monitor.cpp
 2018-01-18 13:44:26 -05:00
Isaac Connor 5472a1a012 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-18 11:40:37 -05:00
Isaac Connor 715adb5acb add locking to Event moving and diskspace updating. 2018-01-18 11:38:08 -05:00
Isaac Connor 655d7be3c9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-01-17 12:59:59 -08:00
Isaac Connor eb92a1ed8b merge updates that fix Event moving 2018-01-17 12:59:34 -08:00
Isaac Connor b71581922f Only update db record if there is a change in diskspace 2018-01-17 12:56:37 -08:00
Isaac Connor 22df150cb2 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_packetqueue.cpp
 2018-01-17 13:59:34 -05:00
Isaac Connor 306e9a75ee Fix issues with a period in the column name 2018-01-16 21:45:01 -05:00
Isaac Connor b35e6adc8f Merge branch 'storageareas' into zma_to_thread 2018-01-16 17:55:08 -05:00
Isaac Connor 426976ddb7 cleanup return code 2018-01-16 14:04:44 -05:00
Isaac Connor aaa6c5cccb Only delete files if no error 2018-01-16 14:01:26 -05:00
Isaac Connor a2211bf438 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_event.cpp
	src/zm_monitor.cpp
 2018-01-16 13:36:57 -05:00
Isaac Connor dfb7079f83 FIX update interval. 2018-01-16 09:32:18 -05:00
Isaac Connor abec2ce4cd Add code to optionally run zmstats.pl and zmaudit.pl 2018-01-16 09:31:58 -05:00
Isaac Connor f808d187c1 Fix logic update Server stats update line 2018-01-15 19:23:59 -05:00
Isaac Connor 42c999e655 :Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	web/skins/classic/js/classic.js
 2018-01-14 18:14:02 -05:00
Isaac Connor 1d6c9d6edd Empty Storage Name should not be Fatal 2018-01-13 10:14:11 -05:00
Isaac 12d310a9cb Cleanup 2018-01-11 22:53:34 +01:00
Isaac e7274a8f91 cleanup. Restart zma when restarting zmc because it may hold the mmap open 2018-01-11 22:53:26 +01:00
Isaac Connor b86d32c005 When we need to restart zmc, we may need to restart zma due to not enough space in /dev/shm. 2018-01-11 15:00:05 -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 7c9c2b0f01 Merge branch 'storageareas' into zma_to_thread 2018-01-10 15:25:20 -05:00