Commit Graph

11214 Commits

Author SHA1 Message Date
Isaac Connor 20f6985dff implement capturing bandwidth 2018-04-24 14:11:27 -04:00
Isaac Connor e4465c0a61 add this to git... 2018-04-24 12:44:11 -04:00
Isaac Connor bbb10fa4b4 Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34 2018-04-24 12:40:15 -04:00
Isaac Connor 21413c0fe6 comment out corrupting code 2018-04-24 11:49:10 -04:00
Isaac Connor cc525b2397 Output more detailed shared mem size info 2018-04-24 11:41:54 -04:00
Isaac Connor 4d95498664 Prevent double init of Ffmpeg by using FFMPEGInit() 2018-04-24 11:41:31 -04:00
Isaac Connor 93ad25e124 rework zmdc.pl to better handle killing processes 2018-04-24 11:41:04 -04:00
Isaac Connor cc77561826 fix last_event being uint64 2018-04-24 11:40:38 -04:00
Isaac Connor b5ff820c61 Test that shm is always valid in zma so that zma dies if zmc does. 2018-04-23 16:24:44 -04:00
Isaac Connor 5f7d404a0c spacing & style. Put locking around db accesses in RealoadLinkedMonitors 2018-04-23 16:24:15 -04:00
Isaac Connor e8eaf5fc80 quiten build error 2018-04-23 14:43:16 -04:00
Isaac Connor c0d04521d4 cleanup. Google Code Style. Move diag_path from a static to a class member so that multiple zones will create different diag files. 2018-04-23 14:36:54 -04:00
Isaac Connor 18b015903a cleanup. Google Code Style. Move diag_path from a static to a class member so that multiple zones will create different diag files. 2018-04-23 14:36:46 -04:00
Isaac Connor 3ab0755e03 google code style plus other cleanups 2018-04-23 13:50:10 -04:00
Isaac Connor a110ae71f5 put lines back preventing double open of mysql 2018-04-23 13:48:14 -04:00
Isaac Connor e3161687ba google code style 2018-04-23 11:16:37 -04:00
Isaac Connor f752b3077a add the # of seconds before kill to the log line 2018-04-23 11:16:24 -04:00
Isaac Connor 235fc640be exit_zmu must come before use 2018-04-23 11:15:33 -04:00
Isaac Connor 11cacebb3b use a function called exit_zmu instead of exit() to properly close logs and db. The reason is just to reduce connection lost logs in mysql. 2018-04-23 11:14:44 -04:00
Isaac Connor 3b9f7b38c5 Use int instead of long. Monitor->GetCaptureDelay returns an int, so no reason to use long. 2018-04-23 10:40:42 -04:00
Isaac Connor 609244857d google styleguide updates 2018-04-23 10:39:32 -04:00
Isaac Connor 9c0600cace Add a HUP Handler 2018-04-23 10:29:42 -04:00
Andrew Bauer 600b66e27c
Update zoneminder.spec 2018-04-23 07:41:36 -05:00
Andrew Bauer 93263c40b4
Remove mention of el6 from readthedocs 2018-04-22 07:30:28 -05:00
Andy Bauer 02f8493b39 rpm packaging - remove support for sysvinit aka el6 2018-04-22 07:25:06 -05:00
Andy Bauer f13d174ea5 remove support for el6 from the buildsystem 2018-04-21 21:49:04 -05:00
Andrew Bauer 35dcedb2ad
fix ftbs on el7
adds compiler support for PRIu64
2018-04-21 20:55:21 -05:00
Andrew Bauer 4f7e0fedad
Update startpackpack.sh 2018-04-21 18:50:46 -05:00
Andrew Bauer db293944c3
Update startpackpack.sh 2018-04-21 18:49:35 -05:00
Isaac Connor 860450307f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-21 10:36:01 -04:00
Isaac Connor 662215d125 Merge ../ZoneMinder.connortechnology 2018-04-21 10:35:49 -04:00
Isaac Connor 3560c0d610 fix displayed tbale header twice 2018-04-21 10:35:36 -04:00
Andrew Bauer 97b66340ac
add dnsutils and traceroute packages to travis 2018-04-21 08:41:12 -05:00
Andy Bauer 287eb330eb add network connectivity checks to zmrepo 2018-04-21 08:37:27 -05:00
Andrew Bauer 519c36ae7d
Update startpackpack.sh 2018-04-20 21:24:49 -05:00
Andrew Bauer 779e77ac29
Update startpackpack.sh 2018-04-20 21:12:15 -05:00
Andrew Bauer 782d237b2d
Update startpackpack.sh 2018-04-20 21:10:24 -05:00
Andrew Bauer 8a61fb2532
redirect standard error when we mount zmrepo 2018-04-20 20:15:50 -05:00
Isaac Connor 578df0c5cc update submodules 2018-04-20 16:18:58 -04:00
Isaac Connor c65255a067 Merge ../ZoneMinder.connortechnology 2018-04-20 15:56:42 -04:00
Isaac Connor a868bb70ed Better debug when fail to attach images 2018-04-20 15:56:14 -04:00
Isaac Connor fac3cde1e7 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-20 15:23:23 -04:00
Isaac Connor 3ea39ad417 whitespace 2018-04-20 15:22:45 -04:00
Isaac Connor 1d4e79feb1 Update filters a bit, using Event as an object to get the Path, etc 2018-04-20 15:22:31 -04:00
Isaac Connor 5a93458441 add StartTime to Filters 2018-04-20 15:22:12 -04:00
Isaac Connor 8b165c34b0 Handle event and frame no found earlier 2018-04-20 14:25:54 -04:00
Isaac Connor 781438d4c5 specify E.* in query because otherwise it uses M.Id for Id 2018-04-20 14:25:38 -04:00
Isaac Connor fedc4d4cb1 spacing 2018-04-20 14:24:56 -04:00
Isaac Connor ac775f13f6 always return an array from find_all 2018-04-20 14:23:27 -04:00
Isaac Connor 9de3c44702 Add find_one and caching 2018-04-20 14:23:04 -04:00