Commit Graph

68 Commits

Author SHA1 Message Date
Isaac Connor 20962cda0d Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-16 18:45:28 -08:00
Isaac Connor 306e9a75ee Fix issues with a period in the column name 2018-01-16 21:45:01 -05:00
Isaac Connor b09bb528a5 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-16 08:42:41 -08:00
Isaac Connor f808d187c1 Fix logic update Server stats update line 2018-01-15 19:23:59 -05:00
Isaac Connor 90d7fee8bb use last, not break 2018-01-11 19:14:37 -08:00
Isaac Connor ef16393402 Merge branch 'storageareas' into tesla 2018-01-11 18:59:22 -08: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 80f0515eae break after sending kill 2018-01-09 09:15:55 -08: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 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 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
Andrew Bauer 8bac5fbdfb typo - remove extra comma 2016-05-18 16:58:04 -05:00
Isaac Connor 3a0aa09c2f Force reconnect to the db after fork. 2016-05-13 09:09:49 -04:00
Isaac Connor 605edfd6d0 add ENV{LD_PRELOAD} setting 2016-05-09 12:46:26 -04:00
abi 7058b0862a suppressed warnings of killall for FreeBSD 2016-04-16 16:39:58 +03: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
Kyle Johnson bc89b95470 Merge pull request #1292 from ZoneMinder/telemetry
Telemetry Data
2016-03-01 07:17:16 -07:00