Commit Graph

157 Commits

Author SHA1 Message Date
Isaac Connor
b618030b7a Increase time between TERM and KILL because ffmpeg connect can take way more than 10 secs 2023-12-14 09:29:03 -05:00
Isaac Connor
b6bd1c93ad Sort output of status by pid. 2023-10-31 09:59:02 -04:00
ovargasp
6753a04e91 Latest version of zmAlarmServer 2022-08-05 16:46:11 -06:00
Isaac Connor
7d9525e28b WARNING should be a DEBUG when restarting a process 2022-04-28 10:36:06 -04:00
Isaac Connor
ffdb0f9824 If we are starting a process that is waiting to term, mark it to get started by the reaper. Fixes case where zmdc thought the process was still running and so didn't start it. We never noticed because zmwatch would eventually notice. The result is instant restart. 2021-11-23 11:05:39 -05:00
Isaac Connor
b70cd0bc76 Add zm_rtsp_server to list of daemons we can start 2021-03-01 16:47:18 -05:00
Isaac Connor
0b0df96271 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-02-18 16:05:10 -05:00
Peter Keresztes Schmidt
687ba03eb4 Drop relicts of zma 2021-02-10 13:26:25 +01:00
Isaac Connor
fab7efa003 Fix PrimeCapture on local cams. We need to be able to call it for each monitor 2021-02-09 20:29:37 -05:00
Isaac Connor
8a99665311 better variable names and code documentation 2021-02-03 09:50:13 -05:00
Isaac Connor
284b9f963f Merge branch 'master' into zma_to_thread 2020-12-29 12:18:26 -05:00
Isaac Connor
869860bb26 Merge branch 'master' into zma_to_thread 2020-07-21 17:49:39 -04:00
Isaac Connor
c022cae7ef Sleep 10 secs if db connection fails to reduce log spamming and load 2020-06-30 18:59:27 -04:00
Isaac Connor
e618966e08 spacing, improve error message when can't connect. 2020-06-23 10:23:17 -04:00
Isaac Connor
09fcbad666 Merge branch 'master' into zma_to_thread 2019-11-30 14:59:39 -05:00
Isaac Connor
6c997a0bd6 quotes 2019-11-22 10:03:09 -05:00
Isaac Connor
f1ec455665 Add some debug to logrot 2019-11-21 10:49:23 -05:00
Isaac Connor
19d4a2287f When restarting, if the process was already dead, we won't restart it. So add a start call. Fixes #2757 2019-11-20 14:22:12 -05:00
Isaac Connor
766a59884d Don't hard code perl path. Use PERL_EXECUTABLE cmake var 2019-09-23 12:54:27 -04:00
Isaac Connor
96b7d30d7d Merge branch 'master' into zma_to_thread 2019-04-15 10:47:26 -04:00
Andrew Bauer
2bb15c4f90 daemonize zmcontrol (#2563) 2019-04-01 17:26:24 -04:00
Isaac Connor
28dafd5931 Merge branch 'storageareas' into zma_to_thread 2018-12-26 12:02:00 -05:00
Isaac Connor
6af8f0d419 Logging and whitespace 2018-12-20 13:55:18 -05:00
Isaac Connor
b16cd7ec84 Merge branch 'h265' into zma_to_thread 2018-11-20 12:38:17 -05:00
Isaac Connor
62e511cfd1 Merge branch 'master' into h265 2018-11-17 10:41:20 -05:00
Andrew Bauer
b4f77077e9 Update zmdc.pl.in
temporary fix to #2292
2018-11-16 18:33:54 -06:00
Isaac Connor
a8329465fb Merge branch 'master' into h265 2018-10-22 10:30:01 -04:00
Isaac Connor
5ab1126260 Merge branch 'storageareas' into zma_to_thread 2018-10-20 17:31:14 -04:00
Isaac Connor
e0dc8a5f6b Merge branch 'master' into storageareas 2018-09-27 13:54:53 -04:00
Isaac Connor
66f11435b9 perhaps fix memory corruption due to libx264 writing to stderr which may be closed. 2018-09-27 13:50:11 -04:00
Isaac Connor
672b4affe1 Merge branch 'storageareas' into zma_to_thread 2018-08-31 19:05:22 -04:00
Isaac Connor
f2d4739838 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-08-24 17:11:39 -04:00
Isaac Connor
627d47980a prevent killall zombies by ignoring SIGCHLD at startup 2018-08-22 16:33:11 -04:00
Isaac Connor
979b31ffc3 Merge branch 'storageareas' into zma_to_thread 2018-08-11 10:08:30 -04:00
Isaac Connor
50c7eec0ff Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-08-02 05:25:53 -04:00
Isaac Connor
a594a1b6f1 Merge branch 'master' into storageareas 2018-06-15 09:45:11 -04:00
Isaac Connor
fef88107e1 Close the db before forking in start() 2018-06-14 14:54:00 -04:00
Isaac Connor
a4ade03e6f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-06-11 14:08:19 -04:00
Isaac Connor
d1f658bf30 minor spacing changes, remove unused Server lookup 2018-06-11 14:07:49 -04:00
Isaac Connor
48f8118e5a put back logReInit 2018-06-10 15:01:20 -04:00
Isaac Connor
578efb3a76 Need to do reaper in shutdownALl 2018-06-10 14:21:09 -04:00
Andrew Bauer
982f5e2442 fix typo 2018-06-10 12:15:26 -05:00
Isaac Connor
c7a85e37f8 rework reaper making it simply add the pid and status data into a hash of children to reap and due the reaping/restarting in the main loop. 2018-06-09 18:52:01 -04:00
Isaac Connor
934ce654f9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-06-08 15:21:43 -04:00
Isaac Connor
374123f9c2 get rid of debugging and turn of extra logReInit 2018-06-08 14:21:27 -04:00
Isaac Connor
7c32e4d86c Move zmDbConnect up before logInit because the db handle got closed 2018-06-08 09:15:19 -04:00
Andrew Bauer
61445620aa create the pid file before doing anything else (#2114)
* create the pid file before doing anything else

* update comment
2018-06-08 08:53:23 -04:00
Isaac Connor
20bef5f381 Remove unused Server loading and debug statements 2018-06-07 09:57:54 -04:00
Isaac Connor
b3c9f508f4 Remove debugging line that is causing systemd to fail 2018-06-06 11:40:12 -04:00
Isaac Connor
21e26c8c14 Spacing and parenthesis and some debug lines 2018-05-31 10:25:16 -04:00