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

74 Commits

Author SHA1 Message Date
Isaac Connor a1392bf613 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_mpeg.cpp
	src/zmc.cpp
 2018-02-02 14:23:26 -05:00
Isaac Connor 4933b37b69 fix log levels 2018-01-30 10:45: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 83371d0f21 Fix Error => Debug 2018-01-23 17:42:57 +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 3749eb3e6f Only send kill once. No point in repeating it 2018-01-19 08:19:10 -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 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 f808d187c1 Fix logic update Server stats update line 2018-01-15 19:23:59 -05:00
Isaac Connor c3ab7d5269 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_packetqueue.cpp
	src/zma.cpp
 2018-01-10 14:24:46 -05:00
Isaac Connor 8186a17a86 reduce frequency of Server updating 2018-01-10 13:20:09 -05:00
Isaac Connor cdbe1b9216 Only load SYs::MemInfo and Sys::CpuLoad if we are going to use them. Only start various services if they are turned on 2018-01-10 12:57:37 -05:00
Isaac Connor b2fbd976cb double the amount of time we wait for a process to end 2018-01-08 16:21:51 -05:00
Isaac Connor 0fbb473dd4 refactoring 2017-10-25 13:06:15 -07:00
Isaac Connor 3c0be45eb8 have zmdc.pl update the Servers table with system status information 2017-10-24 15:13:48 -07:00
Isaac Connor 6c03ae32c2 add code to update the statuses in the Server record every second. This code also reduces the timeout from .1 seconds to 1 second. Should reduce load by zmdc on low power devices. I see no reason to poll that heavily... 2017-10-24 12:31:23 -07:00
Isaac Connor da74f8d533 initial turn zma into a thread 2017-07-10 19:37:55 -04:00
Isaac Connor f183a74b0a increase the wait time for waiting for zmdc to startup 2017-07-04 10:11:57 -04:00
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Isaac Connor 013dab0f47 must unblock after blocking in killuntildead 2017-04-29 14:52:47 -04:00
Isaac Connor 1b0f5bda4c usleep for 20000 usecs. Testing on i7 says 17000 is average value it takes to startup 2017-04-28 14:19:16 -04:00
Isaac Connor 151126e70c fix placing of KILL_DELAY constant and turn it to 1/10th of a second instead of 1/100/th 2017-04-28 11:43:36 -04:00
Isaac Connor e9e913c043 fixup whitespace. Switch to useconds and sleep and sleep for less time when starting up and comment out the 5 second shutdown wait. 2017-04-28 10:32:05 -04:00
Isaac Connor d5fd4b43a5 experiment with zmDbDisconnect before forking 2017-04-16 11:24:37 -04:00
Isaac Connor 5c3a582252 The signal we should be blocking is SIGCHLD not SIGINT 2017-04-06 21:21:28 -04:00
Isaac Connor a689fcff88 Fix use Time::HiRes 2017-04-05 16:08:47 -04:00
Isaac Connor c944870526 sleep 100usec 2017-03-31 13:49:44 -04:00
Isaac Connor 58d119d9ed Merge branch 'fix_1762' into storageareas 2017-03-31 13:38:59 -04:00
Isaac Connor d3b6792a6a block signals around checking for a process to die 2017-03-31 12:25:48 -04:00
SteveGilvarry 2f3ebd80da Remove zmf, die..die..die 2017-01-16 13:20:05 -08: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 a77de33997 add a test for lib existence 2016-09-27 12:51:04 -04:00
Isaac Connor 69461a7c1b Merge pull request #1579 from peruchi/master 
Update file sock for multiserver
 2016-08-17 10:23:01 -04:00
peruchi 50f55af68f Update zmdc.pl.in 2016-08-17 10:36:00 -03:00
peruchi 7b389a79a6 Update zmdc.pl.in 2016-08-17 09:45:30 -03:00
peruchi 0d85d3e60d Update zmdc.pl.in 2016-08-02 16:26:27 -03:00
peruchi 0238656542 Update file sock for multiserver 
Added the ZM_SERVER_ID in the creation the sock for not to give conflict in mode multi server.
 2016-08-02 15:36:40 -03:00
Isaac Connor 89d4b9fec5 ifdef the libswresample lib stuff 2016-09-27 13:34:10 -04:00
Isaac Connor 747382f214 change double quotes to single quotes. When can't connect, print out the path to the sock file 2016-08-22 13:34:02 -04:00
Isaac Connor d618b612fe google code style & whitespace 2016-08-22 12:08:49 -04:00
Isaac Connor eafe3d7748 Merge branch 'master' into storageareas 2016-08-17 10:31:55 -04:00
Isaac Connor 326c4f1fee Check for existence of libraries specified in LD_PRELOAD and warn about them not existing 2016-05-30 14:08:08 -04:00
Isaac Connor 7a08d4620f Merge branch 'master' into storageareas 2016-05-25 10:17:46 -04:00
Isaac Connor 8fabeb78d3 Merge branch 'fix_zone_edit' into storageareas 2016-05-24 15:55:49 -04:00
Andrew Bauer 0052bb080c unlink only if file exists 2016-05-24 12:13:17 -05:00
Andrew Bauer 11701357aa remove one unlink, add better error reporting to the rest 2016-05-24 09:01:32 -05:00
Isaac Connor 182fa9a5cd revert the bulk of the merge_db_connects changes. 2016-05-20 08:53:53 -04:00
Isaac Connor 924acf4284 fix zmdc.pl hang due to needing to connect to db after fork 2016-05-19 15:01:31 -04:00