Commit Graph

91 Commits

Author SHA1 Message Date
Isaac Connor 593167dee6 remove extra code killing processes after KILL_DELAY. check_for_processes_to_kill will kill everything off. 2018-05-08 15:29:34 -04:00
Isaac Connor 62b9662b48 Handle when process is not in cmd_hash 2018-05-08 14:12:53 -04:00
Isaac Connor 6bff8811e7 put back logReinit after forko 2018-05-08 12:52:40 -04:00
Isaac Connor 5242b17b03 Done restartPending message should be a debug, not Info 2018-05-08 10:30:12 -04:00
Isaac Connor d9b6f4bd85 test for value in DBI::errstr 2018-05-04 16:00:55 -04:00
Isaac Connor 8f45b50947 handle null and include errstr 2018-05-04 06:46:24 -07:00
Isaac Connor 769d4a8693 DB connect can die, so put it in an eval 2018-05-03 09:50:54 -07:00
Isaac Connor 1f5c2e2ff7 show ping value when not connected to db 2018-05-02 11:38:48 -04:00
Isaac Connor 59d5297b4b fix wrong order calculating time we have waited for process to die. 2018-05-01 12:08:31 -04:00
Isaac Connor 04198aa381 Log valu of dbh if not connected 2018-04-30 15:09:13 -04:00
Isaac Connor 3f05d46012 Merge zmdc.pl fixes. We can now handle database disconnects gracefully. 2018-04-30 07:09:23 -07:00
Isaac Connor 00e82fb751 Implement MonitoServerId,StorageServerId,FilterServerID in Filters 2018-04-25 13:05:19 -07:00
Isaac Connor f2073c958f more debug 2018-04-25 10:33:42 -07:00
Isaac Connor 27531750a4 Google code style 2018-04-25 10:48:50 -04:00
Isaac Connor 93ad25e124 rework zmdc.pl to better handle killing processes 2018-04-24 11:41:04 -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 5fe7b3f55f increase process kill time to 100 secs. zma can sometimes take this long 2018-04-19 08:17:37 -07:00
Isaac Connor d01682f3ad remove second use 2018-04-18 21:46:55 -04:00
Isaac Connor 6dae6d8949 fix doubled use 2018-04-18 21:29:35 -04:00
Andrew Bauer 04cb1f9300 use ZoneMinder::Server::CpuLoad rather than Sys:CpuLoad (#2080) 2018-04-17 21:09:41 -04:00
Pliable Pixels e5505de1d1 fixed brace styling 2018-03-29 11:27:31 -04:00
Pliable Pixels d64e58e374 silly mistake - wrong names 2018-03-29 11:23:35 -04:00
Pliable Pixels 95eb1d3045 merged master storage areas, resolved conflicts 2018-03-29 08:51:35 -04:00
Pliable Pixels 990d60926e #92 new key 2018-03-29 08:47:55 -04:00
Isaac Connor 0f2cf65039 adjust kill timeouts. Give each process up to 10 seconds to exit 2018-02-13 06:21:39 -05:00
Isaac Connor 4933b37b69 fix log levels 2018-01-30 10:45:32 -05:00
Isaac 83371d0f21 Fix Error => Debug 2018-01-23 17:42:57 +01:00
Isaac Connor 3749eb3e6f Only send kill once. No point in repeating it 2018-01-19 08:19:10 -08:00
Isaac Connor 306e9a75ee Fix issues with a period in the column name 2018-01-16 21:45:01 -05:00
Isaac Connor f808d187c1 Fix logic update Server stats update line 2018-01-15 19:23:59 -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 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