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
|
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
|
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 |
Isaac Connor
|
b445ddc981
|
typo fix
|
2018-05-12 14:36:53 -07:00 |
|
Isaac Connor
|
a86b81d12e
|
Only set term_sent_at if we don't already have one, we may send the stop signal many times
|
2018-05-08 16:08:24 -04:00 |
|
Isaac Connor
|
e6d11bf147
|
block CHLD signals in send_stop, to prevent race condition
|
2018-05-08 15:52:33 -04:00 |
|
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 |